merge errors removed