how to merge back into old branch