merge errors solved