Removing cruft from git conflict.