gitt changes to pull down
correct merge conflict