Conflict removal!