Un-messup the merge