git pull error
fixing divergance