preserve merges in branch when pulling