merge before pull