File break after conflict revision