Resolving installed_os_rhel7 merge conflicts