Service Fabric Deployment Error: ServiceManifest.xml is missing for service

So I finally figured out what was wrong.

I was looking at the files and project dependencies, but missed a missing service dependency. When the two projects were removed from the solution by the merge, the SF project must have lost the service reference. Adding this back in fixed the problem.