solved merge errors