Cleanup formatting after conflict resolving.