please do git pull --rebase. I've just rebase and pushed. Didn't know you're working on it.