Merge already, will ya?