Removed lines added by github for merge conflicts.