FYI, you accidentally left some git merge junk in the file.