took out git merge  text