Fix committed conflict markers. Format space.