removes git merge conflix error text