dev=main after mistakes done during merging

restarts dev-Branch due to inconsistency introduced by mistakes done while solving merge conflicts from dev to main