Remove leftover text from git conflict