Yes, pull --rebase to fix it