pull and merge before push