stash for a pull
fixed conflict