fix conflict

roles/extra_rpms/tasks/main.yml

roles/karaage3.1.17/handlers/main.yml

roles/karaage3.1.17/tasks/apacheDebian.yml

roles/karaage3.1.17/tasks/karaage.yml

roles/karaage3.1.17/tasks/main.yml

roles/karaage3.1.17/templates/default-ssl.j2

roles/karaage3.1.17/templates/settings.py.j2

roles/karaage3.1.17/vars/readme.txt

roles/ldapclient/defaults/main.yml

roles/ldapclient/handlers/main.yml

roles/ldapclient/tasks/configLdapClient.yml

roles/ldapclient/tasks/installOpenLdap.yml

roles/ldapclient/tasks/main.yml

roles/ldapclient/templates/authconfig.j2

roles/ldapclient/templates/ldap.conf.j2

roles/ldapclient/templates/ldapCaCert.j2

roles/ldapclient/templates/nsswitch.conf.j2

roles/ldapclient/templates/pam_ldap.conf.j2

roles/ldapclient/templates/password-auth.j2

roles/ldapclient/templates/sssd.j2