Erased a git merging line that I accidentally left in.