Merge lots of upstream. So glad I got the process simplified.