Removed some weird git merge noise from file.