Cleaned up checked-in merge conflicts.