Conflicts: appvm/Makefile appvm/qubes_core netvm/qubes_core rpm_spec/core-appvm.spec rpm_spec/core-netvm.spec
Modify VM packages to: - do not conflicts - starts services if its VM type need it Added core-proxyvm (firewall) and core-commonvm (common parts) packages.