fast-forward merge before push