git pull error - fixed back to master