Remove accidentally committed conflicts in spec file.