correct merge erros