Cleanup of merge conflicts