merge like we've never merged before