Remove committed conflict