Conflicts: appvm/Makefile appvm/qubes_core netvm/qubes_core rpm_spec/core-appvm.spec rpm_spec/core-netvm.spec