Hello @Nathan_Klym 

Try updating to the latest version of expedition and attempt to merge it again, if it doesn't work then send an email over to fwmigrate@paloaltonetworks.com and we can perform a session. The latest version of expedition is on 1.2.2 so you are few revisions behind.