It looks like you've got a problem with line endings, as this entire file is showing up as changed. I can't merge this if the file has its line endings changed because it will cause a bunch of conflicts.