Resolve Merge conflicts