Remove what is apparently a left over from a git conflict