fixing local branch in front of origin/master after push