Remove remnants of a previous conflict