This looks like a bad merge - the files shouldn't contain >>> HEAD. Suggest correcting before we move this pull-request as it'll blow up the code on master.