Merge before the pull