Merge branch edit-in -place