Clean up some git merges gone wrong.