Yeah, I think that'd be the easiest for merging it in and in case anything needs to get reverted or changed later.