Clean up merge conflicts.