mopping up local repo before push to origin
merged from origin