Fix unresolved conflict in foreman.spec from b03d0a49