merge spec file conflicts.