Somehow your changes here are causing a conflict, tho I have no idea why. Stash your changes, re-pull from my repo, and see if you can fix this. If not, let me know.