merge errors cleaned