clean out merge erros