it fixed bois

also i have only used git pull and git pull upstream master