First round of review of bigmerge