completes merge, left breadcrumb of the first conflict commented out until I get the opportunity to test w/ skipper-disk