update to merge before pass