git pull:Please commit your changes or stash them before you merge