Solving merging generated errors