Remove vestiges from git conflict