Resolve a rogue conflict committed by an automated tool