solving merge errors