updated that freaking obsolete git pull or merge parameter