commit and merge local repo