updates spec files
resolves conflicts