fix accidental committed conflict