[MC] Fixed conflicts in spec file