Fix the merge issues