correct merge errors