remove merge errors