I think we're ready to merge