Remove remnants of merge