Just had a similar issue, upgrading from an install made in August 2019. After running the above resets of the git repo and going back to the upgrade page, this was displayed which I believe is the log of what went wrong, if this helps to avoid future problems. I then ran the schema and data type checks, which gave another set of messages I have put below, after this log.
From
https://github.com/fusionpbx/fusionpbx
056ee9f10..32a979924 master -> origin/master
cd7e9d38b..cd644b223 4.4 -> origin/4.4
warning: Cannot merge binary files: app/contacts/resources/images/icon_gmaps.png (HEAD vs. 32a9799241a816b328b2c5922ef9ddd37481ab21)
Auto-merging themes/default/template.php
CONFLICT (content): Merge conflict in themes/default/template.php
Auto-merging themes/default/css.php
CONFLICT (add/add): Merge conflict in themes/default/css.php
Auto-merging themes/default/app_languages.php
CONFLICT (add/add): Merge conflict in themes/default/app_languages.php
Auto-merging themes/default/app_config.php
CONFLICT (add/add): Merge conflict in themes/default/app_config.php
Auto-merging resources/templates/provision/yealink/vp530/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/vp530/{$mac}.cfg
Auto-merging resources/templates/provision/yealink/t57w/y000000000097.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t57w/y000000000097.cfg
Auto-merging resources/templates/provision/yealink/t54w/y000000000096.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t54w/y000000000096.cfg
Auto-merging resources/templates/provision/yealink/t53w/y000000000095.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t53w/y000000000095.cfg
Auto-merging resources/templates/provision/yealink/t52s/y000000000074.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t52s/y000000000074.cfg
Auto-merging resources/templates/provision/yealink/t49g/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t49g/{$mac}.cfg
Auto-merging resources/templates/provision/yealink/t48s/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t48s/{$mac}.cfg
Auto-merging resources/templates/provision/yealink/t48s/y000000000065.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t48s/y000000000065.cfg
Auto-merging resources/templates/provision/yealink/t48g/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t48g/{$mac}.cfg
Auto-merging resources/templates/provision/yealink/t46s/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t46s/{$mac}.cfg
Auto-merging resources/templates/provision/yealink/t46s/y000000000066.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t46s/y000000000066.cfg
Auto-merging resources/templates/provision/yealink/t46g/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t46g/{$mac}.cfg
Auto-merging resources/templates/provision/yealink/t46g/y000000000028.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t46g/y000000000028.cfg
Auto-merging resources/templates/provision/yealink/t42s/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t42s/{$mac}.cfg
Auto-merging resources/templates/provision/yealink/t42s/y000000000067.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t42s/y000000000067.cfg
Auto-merging resources/templates/provision/yealink/t42g/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t42g/{$mac}.cfg
Auto-merging resources/templates/provision/yealink/t41s/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t41s/{$mac}.cfg
Auto-merging resources/templates/provision/yealink/t41s/y000000000068.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t41s/y000000000068.cfg
Auto-merging resources/templates/provision/yealink/t41p/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t41p/{$mac}.cfg
Auto-merging resources/templates/provision/yealink/t40p/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t40p/{$mac}.cfg
Auto-merging resources/templates/provision/yealink/t40g/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t40g/{$mac}.cfg
Auto-merging resources/templates/provision/yealink/t40g/y000000000076.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t40g/y000000000076.cfg
Auto-merging resources/templates/provision/yealink/t29g/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t29g/{$mac}.cfg
Auto-merging resources/templates/provision/yealink/t27p/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t27p/{$mac}.cfg
Auto-merging resources/templates/provision/yealink/t27g/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t27g/{$mac}.cfg
Auto-merging resources/templates/provision/yealink/t23p/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t23p/{$mac}.cfg
Auto-merging resources/templates/provision/yealink/t23g/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t23g/{$mac}.cfg
Auto-merging resources/templates/provision/yealink/t21p/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/t21p/{$mac}.cfg
Auto-merging resources/templates/provision/yealink/cp960/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/cp960/{$mac}.cfg
Auto-merging resources/templates/provision/yealink/cp920/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/cp920/{$mac}.cfg
Auto-merging resources/templates/provision/yealink/cp860/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/yealink/cp860/{$mac}.cfg
Auto-merging resources/templates/provision/polycom/5.x/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/polycom/5.x/{$mac}.cfg
Auto-merging resources/templates/provision/polycom/4.x/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/polycom/4.x/{$mac}.cfg
Auto-merging resources/templates/provision/mitel/5340/MN_{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/mitel/5340/MN_{$mac}.cfg
Auto-merging resources/templates/provision/mitel/5330/MN_{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/mitel/5330/MN_{$mac}.cfg
Auto-merging resources/templates/provision/mitel/5324/MN_{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/mitel/5324/MN_{$mac}.cfg
Auto-merging resources/templates/provision/grandstream/ht818/{$mac}.xml
CONFLICT (add/add): Merge conflict in resources/templates/provision/grandstream/ht818/{$mac}.xml
Auto-merging resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
CONFLICT (add/add): Merge conflict in resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
Auto-merging resources/templates/provision/grandstream/gxp2170/{$mac}.xml
CONFLICT (add/add): Merge conflict in resources/templates/provision/grandstream/gxp2170/{$mac}.xml
Auto-merging resources/templates/provision/grandstream/gxp2160/{$mac}.xml
CONFLICT (add/add): Merge conflict in resources/templates/provision/grandstream/gxp2160/{$mac}.xml
Auto-merging resources/templates/provision/grandstream/gxp2140/{$mac}.xml
CONFLICT (add/add): Merge conflict in resources/templates/provision/grandstream/gxp2140/{$mac}.xml
Auto-merging resources/templates/provision/grandstream/gxp2135/{$mac}.xml
CONFLICT (add/add): Merge conflict in resources/templates/provision/grandstream/gxp2135/{$mac}.xml
Auto-merging resources/templates/provision/grandstream/gxp2130/{$mac}.xml
CONFLICT (add/add): Merge conflict in resources/templates/provision/grandstream/gxp2130/{$mac}.xml
Auto-merging resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
CONFLICT (add/add): Merge conflict in resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
Auto-merging resources/templates/provision/grandstream/grp26xx/{$mac}.xml
CONFLICT (add/add): Merge conflict in resources/templates/provision/grandstream/grp26xx/{$mac}.xml
Auto-merging resources/templates/provision/grandstream/dp750/{$mac}.xml
CONFLICT (add/add): Merge conflict in resources/templates/provision/grandstream/dp750/{$mac}.xml
Auto-merging resources/templates/provision/fanvil/x6/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/fanvil/x6/{$mac}.cfg
Auto-merging resources/templates/provision/fanvil/x5s/{$mac}.cfg
CONFLICT (add/add): Merge conflict in resources/templates/provision/fanvil/x5s/{$mac}.cfg
Auto-merging resources/templates/conf/autoload_configs/switch.conf.xml
CONFLICT (add/add): Merge conflict in resources/templates/conf/autoload_configs/switch.conf.xml
Auto-merging resources/templates/conf/autoload_configs/fifo.conf.xml
CONFLICT (add/add): Merge conflict in resources/templates/conf/autoload_configs/fifo.conf.xml
CONFLICT (rename/delete): includes/templates/conf/autoload_configs/fax.conf.xml deleted in 32a9799241a816b328b2c5922ef9ddd37481ab21 and renamed to resources/templates/conf/autoload_configs/fax.conf.xml in HEAD. Version HEAD of resources/templates/conf/autoload_configs/fax.conf.xml left in tree.
Auto-merging resources/templates/conf/autoload_configs/conference.conf
CONFLICT (add/add): Merge conflict in resources/templates/conf/autoload_configs/conference.conf
Auto-merging resources/switch.php
CONFLICT (add/add): Merge conflict in resources/switch.php
Auto-merging resources/require.php
CONFLICT (add/add): Merge conflict in resources/require.php
Auto-merging resources/php.php
CONFLICT (add/add): Merge conflict in resources/php.php
Auto-merging resources/paging.php
CONFLICT (add/add): Merge conflict in resources/paging.php
Auto-merging resources/login.php
CONFLICT (add/add): Merge conflict in resources/login.php
Auto-merging resources/functions.php
CONFLICT (add/add): Merge conflict in resources/functions.php
Auto-merging resources/footer.php
CONFLICT (add/add): Merge conflict in resources/footer.php
Auto-merging resources/classes/token.php
CONFLICT (add/add): Merge conflict in resources/classes/token.php
Auto-merging resources/classes/modal.php
CONFLICT (add/add): Merge conflict in resources/classes/modal.php
Auto-merging resources/classes/menu.php
CONFLICT (add/add): Merge conflict in resources/classes/menu.php
Auto-merging resources/classes/domains.php
CONFLICT (add/add): Merge conflict in resources/classes/domains.php
Auto-merging resources/classes/database.php
CONFLICT (add/add): Merge conflict in resources/classes/database.php
Auto-merging resources/check_auth.php
CONFLICT (add/add): Merge conflict in resources/check_auth.php
Auto-merging resources/app_languages.php
CONFLICT (add/add): Merge conflict in resources/app_languages.php
Auto-merging core/users/users.php
CONFLICT (add/add): Merge conflict in core/users/users.php
Auto-merging core/users/user_edit.php
CONFLICT (add/add): Merge conflict in core/users/user_edit.php
Auto-merging core/users/app_menu.php
CONFLICT (add/add): Merge conflict in core/users/app_menu.php
Auto-merging core/users/app_languages.php
CONFLICT (add/add): Merge conflict in core/users/app_languages.php
Auto-merging core/users/app_config.php
CONFLICT (content): Merge conflict in core/users/app_config.php
Auto-merging core/user_settings/user_settings.php
CONFLICT (add/add): Merge conflict in core/user_settings/user_settings.php
Auto-merging core/user_settings/user_setting_edit.php
CONFLICT (add/add): Merge conflict in core/user_settings/user_setting_edit.php
Auto-merging core/user_settings/user_dashboard.php
CONFLICT (add/add): Merge conflict in core/user_settings/user_dashboard.php
Auto-merging core/user_settings/app_menu.php
CONFLICT (add/add): Merge conflict in core/user_settings/app_menu.php
Auto-merging core/user_settings/app_languages.php
CONFLICT (add/add): Merge conflict in core/user_settings/app_languages.php
Auto-merging core/user_settings/app_config.php
CONFLICT (add/add): Merge conflict in core/user_settings/app_config.php
Auto-merging core/upgrade/index.php
CONFLICT (add/add): Merge conflict in core/upgrade/index.php
Auto-merging core/upgrade/app_menu.php
CONFLICT (add/add): Merge conflict in core/upgrade/app_menu.php
Auto-merging core/upgrade/app_languages.php
CONFLICT (add/add): Merge conflict in core/upgrade/app_languages.php
Auto-merging core/upgrade/app_defaults.php
CONFLICT (content): Merge conflict in core/upgrade/app_defaults.php
Auto-merging core/upgrade/app_config.php
CONFLICT (content): Merge conflict in core/upgrade/app_config.php
Auto-merging core/software/resources/classes/software.php
CONFLICT (add/add): Merge conflict in core/software/resources/classes/software.php
Auto-merging core/software/app_defaults.php
CONFLICT (add/add): Merge conflict in core/software/app_defaults.php
Auto-merging core/software/app_config.php
CONFLICT (add/add): Merge conflict in core/software/app_config.php
Auto-merging core/permissions/app_config.php
CONFLICT (add/add): Merge conflict in core/permissions/app_config.php
Auto-merging core/notifications/app_menu.php
CONFLICT (add/add): Merge conflict in core/notifications/app_menu.php
Auto-merging core/notifications/app_languages.php
CONFLICT (add/add): Merge conflict in core/notifications/app_languages.php
Auto-merging core/notifications/app_config.php
CONFLICT (add/add): Merge conflict in core/notifications/app_config.php
Auto-merging core/menu/menu_item_list.php
CONFLICT (content): Merge conflict in core/menu/menu_item_list.php
Auto-merging core/menu/menu_edit.php
CONFLICT (content): Merge conflict in core/menu/menu_edit.php
Auto-merging core/menu/menu.php
CONFLICT (content): Merge conflict in core/menu/menu.php
Auto-merging core/menu/app_menu.php
CONFLICT (add/add): Merge conflict in core/menu/app_menu.php
Auto-merging core/menu/app_languages.php
CONFLICT (add/add): Merge conflict in core/menu/app_languages.php
Auto-merging core/menu/app_config.php
CONFLICT (content): Merge conflict in core/menu/app_config.php
Auto-merging core/install/app_languages.php
CONFLICT (add/add): Merge conflict in core/install/app_languages.php
Auto-merging core/install/app_config.php
CONFLICT (add/add): Merge conflict in core/install/app_config.php
Auto-merging core/groups/resources/classes/groups.php
CONFLICT (add/add): Merge conflict in core/groups/resources/classes/groups.php
Auto-merging core/groups/groups.php
CONFLICT (add/add): Merge conflict in core/groups/groups.php
Auto-merging core/groups/groupmemberdelete.php
CONFLICT (add/add): Merge conflict in core/groups/groupmemberdelete.php
Auto-merging core/groups/groupmemberadd.php
CONFLICT (add/add): Merge conflict in core/groups/groupmemberadd.php
Auto-merging core/groups/group_permissions.php
CONFLICT (add/add): Merge conflict in core/groups/group_permissions.php
Auto-merging core/groups/group_edit.php
CONFLICT (add/add): Merge conflict in core/groups/group_edit.php
Auto-merging core/groups/app_menu.php
CONFLICT (add/add): Merge conflict in core/groups/app_menu.php
Auto-merging core/groups/app_languages.php
CONFLICT (add/add): Merge conflict in core/groups/app_languages.php
Auto-merging core/groups/app_config.php
CONFLICT (add/add): Merge conflict in core/groups/app_config.php
Auto-merging core/domains/domains.php
CONFLICT (content): Merge conflict in core/domains/domains.php
Auto-merging core/domains/domain_edit.php
CONFLICT (add/add): Merge conflict in core/domains/domain_edit.php
Auto-merging core/domains/app_menu.php
CONFLICT (add/add): Merge conflict in core/domains/app_menu.php
Auto-merging core/domains/app_languages.php
CONFLICT (add/add): Merge conflict in core/domains/app_languages.php
Auto-merging core/domains/app_config.php
CONFLICT (content): Merge conflict in core/domains/app_config.php
Auto-merging core/domain_settings/domain_settings.php
CONFLICT (add/add): Merge conflict in core/domain_settings/domain_settings.php
Auto-merging core/domain_settings/domain_setting_edit.php
CONFLICT (add/add): Merge conflict in core/domain_settings/domain_setting_edit.php
Auto-merging core/domain_settings/app_menu.php
CONFLICT (add/add): Merge conflict in core/domain_settings/app_menu.php
Auto-merging core/domain_settings/app_languages.php
CONFLICT (add/add): Merge conflict in core/domain_settings/app_languages.php
Auto-merging core/domain_settings/app_config.php
CONFLICT (add/add): Merge conflict in core/domain_settings/app_config.php
Auto-merging core/default_settings/default_settings.php
CONFLICT (content): Merge conflict in core/default_settings/default_settings.php
Auto-merging core/default_settings/default_setting_edit.php
CONFLICT (content): Merge conflict in core/default_settings/default_setting_edit.php
Auto-merging core/default_settings/app_menu.php
CONFLICT (add/add): Merge conflict in core/default_settings/app_menu.php
Auto-merging core/default_settings/app_languages.php
CONFLICT (add/add): Merge conflict in core/default_settings/app_languages.php
Auto-merging core/default_settings/app_defaults.php
CONFLICT (content): Merge conflict in core/default_settings/app_defaults.php
Auto-merging core/default_settings/app_config.php
CONFLICT (content): Merge conflict in core/default_settings/app_config.php
Auto-merging core/databases/databases.php
CONFLICT (content): Merge conflict in core/databases/databases.php
Auto-merging core/databases/database_edit.php
CONFLICT (content): Merge conflict in core/databases/database_edit.php
Auto-merging core/databases/app_menu.php
CONFLICT (add/add): Merge conflict in core/databases/app_menu.php
Auto-merging core/databases/app_languages.php
CONFLICT (add/add): Merge conflict in core/databases/app_languages.php
Auto-merging core/databases/app_config.php
CONFLICT (content): Merge conflict in core/databases/app_config.php
Auto-merging core/authentication/app_config.php
CONFLICT (add/add): Merge conflict in core/authentication/app_config.php
Auto-merging core/apps/app_menu.php
CONFLICT (add/add): Merge conflict in core/apps/app_menu.php
Auto-merging core/apps/app_languages.php
CONFLICT (add/add): Merge conflict in core/apps/app_languages.php
Auto-merging core/apps/app_config.php
CONFLICT (content): Merge conflict in core/apps/app_config.php
Auto-merging app/yealink/app_config.php
CONFLICT (add/add): Merge conflict in app/yealink/app_config.php
Auto-merging app/xml_cdr/xml_cdr_inc.php
CONFLICT (content): Merge conflict in app/xml_cdr/xml_cdr_inc.php
Auto-merging app/xml_cdr/xml_cdr.php
CONFLICT (content): Merge conflict in app/xml_cdr/xml_cdr.php
Auto-merging app/xml_cdr/v_xml_cdr_import.php
CONFLICT (content): Merge conflict in app/xml_cdr/v_xml_cdr_import.php
Auto-merging app/xml_cdr/resources/classes/xml_cdr.php
CONFLICT (add/add): Merge conflict in app/xml_cdr/resources/classes/xml_cdr.php
Auto-merging app/xml_cdr/app_menu.php
CONFLICT (add/add): Merge conflict in app/xml_cdr/app_menu.php
Auto-merging app/xml_cdr/app_languages.php
CONFLICT (content): Merge conflict in app/xml_cdr/app_languages.php
Auto-merging app/xml_cdr/app_config.php
CONFLICT (content): Merge conflict in app/xml_cdr/app_config.php
Auto-merging app/voicemails/voicemails.php
CONFLICT (add/add): Merge conflict in app/voicemails/voicemails.php
Auto-merging app/voicemails/voicemail_messages.php
CONFLICT (add/add): Merge conflict in app/voicemails/voicemail_messages.php
Auto-merging app/voicemails/voicemail_edit.php
CONFLICT (add/add): Merge conflict in app/voicemails/voicemail_edit.php
Auto-merging app/voicemails/resources/classes/voicemail.php
CONFLICT (add/add): Merge conflict in app/voicemails/resources/classes/voicemail.php
Auto-merging app/voicemails/app_menu.php
CONFLICT (add/add): Merge conflict in app/voicemails/app_menu.php
Auto-merging app/voicemails/app_languages.php
CONFLICT (add/add): Merge conflict in app/voicemails/app_languages.php
Auto-merging app/voicemails/app_config.php
CONFLICT (add/add): Merge conflict in app/voicemails/app_config.php
Auto-merging app/voicemail_greetings/voicemail_greetings.php
CONFLICT (content): Merge conflict in app/voicemail_greetings/voicemail_greetings.php
Auto-merging app/voicemail_greetings/voicemail_greeting_edit.php
CONFLICT (content): Merge conflict in app/voicemail_greetings/voicemail_greeting_edit.php
Auto-merging app/voicemail_greetings/resources/classes/voicemail_greetings.php
CONFLICT (add/add): Merge conflict in app/voicemail_greetings/resources/classes/voicemail_greetings.php
Auto-merging app/voicemail_greetings/app_languages.php
CONFLICT (content): Merge conflict in app/voicemail_greetings/app_languages.php
Auto-merging app/voicemail_greetings/app_config.php
CONFLICT (content): Merge conflict in app/voicemail_greetings/app_config.php
Auto-merging app/vars/vars.php
CONFLICT (content): Merge conflict in app/vars/vars.php
Auto-merging app/vars/app_menu.php
CONFLICT (add/add): Merge conflict in app/vars/app_menu.php
Auto-merging app/vars/app_languages.php
CONFLICT (add/add): Merge conflict in app/vars/app_languages.php
Auto-merging app/vars/app_config.php
CONFLICT (content): Merge conflict in app/vars/app_config.php
Auto-merging app/tones/app_languages.php
CONFLICT (add/add): Merge conflict in app/tones/app_languages.php
Auto-merging app/tones/app_config.php
CONFLICT (add/add): Merge conflict in app/tones/app_config.php
Auto-merging app/time_conditions/time_conditions.php
CONFLICT (add/add): Merge conflict in app/time_conditions/time_conditions.php
Auto-merging app/time_conditions/time_condition_edit.php
CONFLICT (add/add): Merge conflict in app/time_conditions/time_condition_edit.php
Auto-merging app/time_conditions/app_menu.php
CONFLICT (add/add): Merge conflict in app/time_conditions/app_menu.php
Auto-merging app/time_conditions/app_languages.php
CONFLICT (content): Merge conflict in app/time_conditions/app_languages.php
Auto-merging app/time_conditions/app_config.php
CONFLICT (content): Merge conflict in app/time_conditions/app_config.php
Auto-merging app/system/app_menu.php
CONFLICT (add/add): Merge conflict in app/system/app_menu.php
Auto-merging app/system/app_languages.php
CONFLICT (content): Merge conflict in app/system/app_languages.php
Auto-merging app/system/app_config.php
CONFLICT (content): Merge conflict in app/system/app_config.php
Auto-merging app/swissvoice/app_config.php
CONFLICT (add/add): Merge conflict in app/swissvoice/app_config.php
Auto-merging app/streams/streams.php
CONFLICT (add/add): Merge conflict in app/streams/streams.php
Auto-merging app/streams/resources/classes/streams.php
CONFLICT (add/add): Merge conflict in app/streams/resources/classes/streams.php
Auto-merging app/streams/app_menu.php
CONFLICT (add/add): Merge conflict in app/streams/app_menu.php
Auto-merging app/streams/app_languages.php
CONFLICT (add/add): Merge conflict in app/streams/app_languages.php
Auto-merging app/streams/app_config.php
CONFLICT (add/add): Merge conflict in app/streams/app_config.php
Auto-merging app/snom/app_config.php
CONFLICT (add/add): Merge conflict in app/snom/app_config.php
Auto-merging app/sip_status/app_menu.php
CONFLICT (add/add): Merge conflict in app/sip_status/app_menu.php
Auto-merging app/sip_status/app_languages.php
CONFLICT (content): Merge conflict in app/sip_status/app_languages.php
Auto-merging app/sip_status/app_config.php
CONFLICT (content): Merge conflict in app/sip_status/app_config.php
Auto-merging app/sip_profiles/sip_profiles.php
CONFLICT (content): Merge conflict in app/sip_profiles/sip_profiles.php
Auto-merging app/sip_profiles/sip_profile_edit.php
CONFLICT (add/add): Merge conflict in app/sip_profiles/sip_profile_edit.php
Auto-merging app/sip_profiles/sip_profile_copy.php
CONFLICT (content): Merge conflict in app/sip_profiles/sip_profile_copy.php
Auto-merging app/sip_profiles/app_menu.php
CONFLICT (add/add): Merge conflict in app/sip_profiles/app_menu.php
Auto-merging app/sip_profiles/app_languages.php
CONFLICT (add/add): Merge conflict in app/sip_profiles/app_languages.php
Auto-merging app/sip_profiles/app_config.php
CONFLICT (content): Merge conflict in app/sip_profiles/app_config.php
Auto-merging app/settings/app_menu.php
CONFLICT (add/add): Merge conflict in app/settings/app_menu.php
Auto-merging app/settings/app_languages.php
CONFLICT (content): Merge conflict in app/settings/app_languages.php
Auto-merging app/settings/app_config.php
CONFLICT (content): Merge conflict in app/settings/app_config.php
Auto-merging app/scripts/resources/scripts/fax_retry.lua
CONFLICT (add/add): Merge conflict in app/scripts/resources/scripts/fax_retry.lua
Auto-merging app/scripts/resources/scripts/disa.lua
CONFLICT (add/add): Merge conflict in app/scripts/resources/scripts/disa.lua
Auto-merging app/scripts/resources/scripts/call_flow.lua
CONFLICT (add/add): Merge conflict in app/scripts/resources/scripts/call_flow.lua
Auto-merging app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/directory.lua
CONFLICT (add/add): Merge conflict in app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/directory.lua
Auto-merging app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua
CONFLICT (add/add): Merge conflict in app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua
Auto-merging app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua
CONFLICT (add/add): Merge conflict in app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua
Auto-merging app/scripts/resources/scripts/app/voicemail/resources/functions/record_message.lua
CONFLICT (add/add): Merge conflict in app/scripts/resources/scripts/app/voicemail/resources/functions/record_message.lua
Auto-merging app/scripts/resources/scripts/app/voicemail/resources/functions/macro.lua
CONFLICT (add/add): Merge conflict in app/scripts/resources/scripts/app/voicemail/resources/functions/macro.lua
Auto-merging app/scripts/resources/scripts/app/voicemail/index.lua
CONFLICT (add/add): Merge conflict in app/scripts/resources/scripts/app/voicemail/index.lua
Auto-merging app/scripts/resources/scripts/app/ring_groups/index.lua
CONFLICT (add/add): Merge conflict in app/scripts/resources/scripts/app/ring_groups/index.lua
Auto-merging app/scripts/resources/scripts/app/is_local/index.lua
CONFLICT (add/add): Merge conflict in app/scripts/resources/scripts/app/is_local/index.lua
Auto-merging app/scripts/resources/scripts/app/follow_me/index.lua
CONFLICT (add/add): Merge conflict in app/scripts/resources/scripts/app/follow_me/index.lua
Auto-merging app/scripts/resources/scripts/app/conference_center/index.lua
CONFLICT (add/add): Merge conflict in app/scripts/resources/scripts/app/conference_center/index.lua
Auto-merging app/ring_groups/ring_groups.php
CONFLICT (content): Merge conflict in app/ring_groups/ring_groups.php
Auto-merging app/ring_groups/ring_group_forward.php
CONFLICT (add/add): Merge conflict in app/ring_groups/ring_group_forward.php
Auto-merging app/ring_groups/ring_group_edit.php
CONFLICT (add/add): Merge conflict in app/ring_groups/ring_group_edit.php
Auto-merging app/ring_groups/app_menu.php
CONFLICT (add/add): Merge conflict in app/ring_groups/app_menu.php
Auto-merging app/ring_groups/app_languages.php
CONFLICT (content): Merge conflict in app/ring_groups/app_languages.php
Auto-merging app/ring_groups/app_config.php
CONFLICT (content): Merge conflict in app/ring_groups/app_config.php
Auto-merging app/registrations/resources/classes/registrations.php
CONFLICT (add/add): Merge conflict in app/registrations/resources/classes/registrations.php
Auto-merging app/registrations/registrations.php
CONFLICT (add/add): Merge conflict in app/registrations/registrations.php
Auto-merging app/registrations/app_menu.php
CONFLICT (add/add): Merge conflict in app/registrations/app_menu.php
Auto-merging app/registrations/app_languages.php
CONFLICT (content): Merge conflict in app/registrations/app_languages.php
Auto-merging app/registrations/app_config.php
CONFLICT (content): Merge conflict in app/registrations/app_config.php
Auto-merging app/recordings/recordings.php
CONFLICT (content): Merge conflict in app/recordings/recordings.php
Auto-merging app/recordings/recording_edit.php
CONFLICT (add/add): Merge conflict in app/recordings/recording_edit.php
Auto-merging app/recordings/app_menu.php
CONFLICT (add/add): Merge conflict in app/recordings/app_menu.php
Auto-merging app/recordings/app_languages.php
CONFLICT (content): Merge conflict in app/recordings/app_languages.php
Auto-merging app/recordings/app_config.php
CONFLICT (content): Merge conflict in app/recordings/app_config.php
Auto-merging app/provision/index.php
CONFLICT (content): Merge conflict in app/provision/index.php
Auto-merging app/provision/app_menu.php
CONFLICT (add/add): Merge conflict in app/provision/app_menu.php
Auto-merging app/provision/app_defaults.php
CONFLICT (content): Merge conflict in app/provision/app_defaults.php
Auto-merging app/provision/app_config.php
CONFLICT (content): Merge conflict in app/provision/app_config.php
Auto-merging app/polycom/app_config.php
CONFLICT (add/add): Merge conflict in app/polycom/app_config.php
Auto-merging app/poly/app_config.php
CONFLICT (add/add): Merge conflict in app/poly/app_config.php
Auto-merging app/pin_numbers/pin_numbers.php
CONFLICT (add/add): Merge conflict in app/pin_numbers/pin_numbers.php
Auto-merging app/pin_numbers/app_menu.php
CONFLICT (add/add): Merge conflict in app/pin_numbers/app_menu.php
Auto-merging app/pin_numbers/app_languages.php
CONFLICT (add/add): Merge conflict in app/pin_numbers/app_languages.php
Auto-merging app/pin_numbers/app_config.php
CONFLICT (add/add): Merge conflict in app/pin_numbers/app_config.php
Auto-merging app/phrases/phrases.php
CONFLICT (add/add): Merge conflict in app/phrases/phrases.php
Auto-merging app/phrases/phrase_edit.php
CONFLICT (add/add): Merge conflict in app/phrases/phrase_edit.php
Auto-merging app/phrases/app_menu.php
CONFLICT (add/add): Merge conflict in app/phrases/app_menu.php
Auto-merging app/phrases/app_languages.php
CONFLICT (add/add): Merge conflict in app/phrases/app_languages.php
Auto-merging app/phrases/app_config.php
CONFLICT (add/add): Merge conflict in app/phrases/app_config.php
Auto-merging app/number_translations/number_translations.php
CONFLICT (add/add): Merge conflict in app/number_translations/number_translations.php
Auto-merging app/number_translations/number_translation_edit.php
CONFLICT (add/add): Merge conflict in app/number_translations/number_translation_edit.php
Auto-merging app/number_translations/app_menu.php
CONFLICT (add/add): Merge conflict in app/number_translations/app_menu.php
Auto-merging app/number_translations/app_languages.php
CONFLICT (add/add): Merge conflict in app/number_translations/app_languages.php
Auto-merging app/number_translations/app_config.php
CONFLICT (add/add): Merge conflict in app/number_translations/app_config.php
Auto-merging app/music_on_hold/resources/classes/switch_music_on_hold.php
CONFLICT (content): Merge conflict in app/music_on_hold/resources/classes/switch_music_on_hold.php
Auto-merging app/music_on_hold/music_on_hold.php
CONFLICT (content): Merge conflict in app/music_on_hold/music_on_hold.php
Auto-merging app/music_on_hold/app_menu.php
CONFLICT (add/add): Merge conflict in app/music_on_hold/app_menu.php
Auto-merging app/music_on_hold/app_languages.php
CONFLICT (add/add): Merge conflict in app/music_on_hold/app_languages.php
Auto-merging app/music_on_hold/app_config.php
CONFLICT (content): Merge conflict in app/music_on_hold/app_config.php
Auto-merging app/modules/modules.php
CONFLICT (content): Merge conflict in app/modules/modules.php
Auto-merging app/modules/app_menu.php
CONFLICT (add/add): Merge conflict in app/modules/app_menu.php
Auto-merging app/modules/app_languages.php
CONFLICT (add/add): Merge conflict in app/modules/app_languages.php
Auto-merging app/modules/app_config.php
CONFLICT (content): Merge conflict in app/modules/app_config.php
Auto-merging app/messages/messages_log.php
CONFLICT (add/add): Merge conflict in app/messages/messages_log.php
Auto-merging app/messages/message_edit.php
CONFLICT (add/add): Merge conflict in app/messages/message_edit.php
Auto-merging app/messages/app_menu.php
CONFLICT (add/add): Merge conflict in app/messages/app_menu.php
Auto-merging app/messages/app_languages.php
CONFLICT (add/add): Merge conflict in app/messages/app_languages.php
Auto-merging app/messages/app_config.php
CONFLICT (add/add): Merge conflict in app/messages/app_config.php
Auto-merging app/meetings/app_menu.php
CONFLICT (add/add): Merge conflict in app/meetings/app_menu.php
Auto-merging app/meetings/app_config.php
CONFLICT (content): Merge conflict in app/meetings/app_config.php
Auto-merging app/log_viewer/app_menu.php
CONFLICT (add/add): Merge conflict in app/log_viewer/app_menu.php
Auto-merging app/log_viewer/app_languages.php
CONFLICT (add/add): Merge conflict in app/log_viewer/app_languages.php
Auto-merging app/log_viewer/app_config.php
CONFLICT (content): Merge conflict in app/log_viewer/app_config.php
Auto-merging app/ivr_menus/ivr_menus.php
CONFLICT (add/add): Merge conflict in app/ivr_menus/ivr_menus.php
Auto-merging app/ivr_menus/ivr_menu_edit.php
CONFLICT (add/add): Merge conflict in app/ivr_menus/ivr_menu_edit.php
Auto-merging app/ivr_menus/app_menu.php
CONFLICT (add/add): Merge conflict in app/ivr_menus/app_menu.php
Auto-merging app/ivr_menus/app_languages.php
CONFLICT (add/add): Merge conflict in app/ivr_menus/app_languages.php
Auto-merging app/ivr_menus/app_config.php
CONFLICT (add/add): Merge conflict in app/ivr_menus/app_config.php
Auto-merging app/htek/app_config.php
CONFLICT (add/add): Merge conflict in app/htek/app_config.php
Auto-merging app/gswave/app_menu.php
CONFLICT (add/add): Merge conflict in app/gswave/app_menu.php
Auto-merging app/gswave/app_languages.php
CONFLICT (add/add): Merge conflict in app/gswave/app_languages.php
Auto-merging app/gswave/app_config.php
CONFLICT (add/add): Merge conflict in app/gswave/app_config.php
Auto-merging app/grandstream/app_config.php
CONFLICT (add/add): Merge conflict in app/grandstream/app_config.php
Auto-merging app/gateways/gateways.php
CONFLICT (content): Merge conflict in app/gateways/gateways.php
Auto-merging app/gateways/gateway_edit.php
CONFLICT (content): Merge conflict in app/gateways/gateway_edit.php
Auto-merging app/gateways/app_menu.php
CONFLICT (add/add): Merge conflict in app/gateways/app_menu.php
Auto-merging app/gateways/app_languages.php
CONFLICT (add/add): Merge conflict in app/gateways/app_languages.php
Auto-merging app/gateways/app_config.php
CONFLICT (content): Merge conflict in app/gateways/app_config.php
Auto-merging app/follow_me/app_menu.php
CONFLICT (add/add): Merge conflict in app/follow_me/app_menu.php
Auto-merging app/follow_me/app_config.php
CONFLICT (content): Merge conflict in app/follow_me/app_config.php
Auto-merging app/fifo_list/app_menu.php
CONFLICT (add/add): Merge conflict in app/fifo_list/app_menu.php
Auto-merging app/fifo_list/app_languages.php
CONFLICT (add/add): Merge conflict in app/fifo_list/app_languages.php
Auto-merging app/fifo_list/app_config.php
CONFLICT (content): Merge conflict in app/fifo_list/app_config.php
Auto-merging app/fifo/app_menu.php
CONFLICT (add/add): Merge conflict in app/fifo/app_menu.php
Auto-merging app/fifo/app_languages.php
CONFLICT (add/add): Merge conflict in app/fifo/app_languages.php
Auto-merging app/fifo/app_config.php
CONFLICT (content): Merge conflict in app/fifo/app_config.php
Auto-merging app/fax/fax_send.php
CONFLICT (add/add): Merge conflict in app/fax/fax_send.php
Auto-merging app/fax/fax_logs.php
CONFLICT (add/add): Merge conflict in app/fax/fax_logs.php
Auto-merging app/fax/fax_log_view.php
CONFLICT (add/add): Merge conflict in app/fax/fax_log_view.php
Auto-merging app/fax/fax_files.php
CONFLICT (add/add): Merge conflict in app/fax/fax_files.php
Auto-merging app/fax/fax_edit.php
CONFLICT (content): Merge conflict in app/fax/fax_edit.php
Auto-merging app/fax/fax_active.php
CONFLICT (add/add): Merge conflict in app/fax/fax_active.php
Auto-merging app/fax/fax.php
CONFLICT (content): Merge conflict in app/fax/fax.php
Auto-merging app/fax/app_menu.php
CONFLICT (add/add): Merge conflict in app/fax/app_menu.php
Auto-merging app/fax/app_languages.php
CONFLICT (content): Merge conflict in app/fax/app_languages.php
Auto-merging app/fax/app_config.php
CONFLICT (content): Merge conflict in app/fax/app_config.php
Auto-merging app/fanvil/app_config.php
CONFLICT (add/add): Merge conflict in app/fanvil/app_config.php
Auto-merging app/extensions/extensions.php
CONFLICT (content): Merge conflict in app/extensions/extensions.php
Auto-merging app/extensions/extension_edit.php
CONFLICT (content): Merge conflict in app/extensions/extension_edit.php
Auto-merging app/extensions/extension_copy.php
CONFLICT (content): Merge conflict in app/extensions/extension_copy.php
Auto-merging app/extensions/app_menu.php
CONFLICT (add/add): Merge conflict in app/extensions/app_menu.php
Auto-merging app/extensions/app_languages.php
CONFLICT (add/add): Merge conflict in app/extensions/app_languages.php
Auto-merging app/extensions/app_config.php
CONFLICT (content): Merge conflict in app/extensions/app_config.php
Auto-merging app/errors/app_menu.php
CONFLICT (add/add): Merge conflict in app/errors/app_menu.php
Auto-merging app/errors/app_languages.php
CONFLICT (add/add): Merge conflict in app/errors/app_languages.php
Auto-merging app/errors/app_config.php
CONFLICT (add/add): Merge conflict in app/errors/app_config.php
Auto-merging app/email_templates/email_templates.php
CONFLICT (add/add): Merge conflict in app/email_templates/email_templates.php
Auto-merging app/email_templates/app_menu.php
CONFLICT (add/add): Merge conflict in app/email_templates/app_menu.php
Auto-merging app/email_templates/app_languages.php
CONFLICT (add/add): Merge conflict in app/email_templates/app_languages.php
Auto-merging app/email_templates/app_defaults.php
CONFLICT (add/add): Merge conflict in app/email_templates/app_defaults.php
Auto-merging app/email_templates/app_config.php
CONFLICT (add/add): Merge conflict in app/email_templates/app_config.php
Auto-merging app/email_logs/email_logs.php
CONFLICT (add/add): Merge conflict in app/email_logs/email_logs.php
Auto-merging app/email_logs/app_menu.php
CONFLICT (add/add): Merge conflict in app/email_logs/app_menu.php
Auto-merging app/email_logs/app_languages.php
CONFLICT (add/add): Merge conflict in app/email_logs/app_languages.php
Auto-merging app/email_logs/app_config.php
CONFLICT (add/add): Merge conflict in app/email_logs/app_config.php
Auto-merging app/dialplans/resources/switch/conf/dialplan/900_voicemail.xml
CONFLICT (add/add): Merge conflict in app/dialplans/resources/switch/conf/dialplan/900_voicemail.xml
Auto-merging app/dialplans/resources/switch/conf/dialplan/507_call_forward_not_registered.xml
CONFLICT (add/add): Merge conflict in app/dialplans/resources/switch/conf/dialplan/507_call_forward_not_registered.xml
Auto-merging app/dialplans/resources/switch/conf/dialplan/505_call-forward-all.xml
CONFLICT (add/add): Merge conflict in app/dialplans/resources/switch/conf/dialplan/505_call-forward-all.xml
Auto-merging app/dialplans/resources/switch/conf/dialplan/300_dx.xml
CONFLICT (add/add): Merge conflict in app/dialplans/resources/switch/conf/dialplan/300_dx.xml
Auto-merging app/dialplans/dialplans.php
CONFLICT (add/add): Merge conflict in app/dialplans/dialplans.php
Auto-merging app/dialplans/dialplan_edit.php
CONFLICT (add/add): Merge conflict in app/dialplans/dialplan_edit.php
Auto-merging app/dialplans/app_menu.php
CONFLICT (add/add): Merge conflict in app/dialplans/app_menu.php
Auto-merging app/dialplans/app_languages.php
CONFLICT (add/add): Merge conflict in app/dialplans/app_languages.php
Auto-merging app/dialplans/app_config.php
CONFLICT (add/add): Merge conflict in app/dialplans/app_config.php
Auto-merging app/dialplan_outbound/dialplan_outbound_add.php
CONFLICT (content): Merge conflict in app/dialplan_outbound/dialplan_outbound_add.php
Auto-merging app/dialplan_outbound/app_menu.php
CONFLICT (add/add): Merge conflict in app/dialplan_outbound/app_menu.php
Auto-merging app/dialplan_outbound/app_languages.php
CONFLICT (add/add): Merge conflict in app/dialplan_outbound/app_languages.php
Auto-merging app/dialplan_outbound/app_config.php
CONFLICT (content): Merge conflict in app/dialplan_outbound/app_config.php
Auto-merging app/dialplan_inbound/app_menu.php
CONFLICT (add/add): Merge conflict in app/dialplan_inbound/app_menu.php
Auto-merging app/dialplan_inbound/app_languages.php
CONFLICT (add/add): Merge conflict in app/dialplan_inbound/app_languages.php
Auto-merging app/dialplan_inbound/app_config.php
CONFLICT (content): Merge conflict in app/dialplan_inbound/app_config.php
Auto-merging app/devices/devices.php
CONFLICT (add/add): Merge conflict in app/devices/devices.php
Auto-merging app/devices/device_vendors.php
CONFLICT (add/add): Merge conflict in app/devices/device_vendors.php
Auto-merging app/devices/device_vendor_functions.php
CONFLICT (add/add): Merge conflict in app/devices/device_vendor_functions.php
Auto-merging app/devices/device_profiles.php
CONFLICT (add/add): Merge conflict in app/devices/device_profiles.php
Auto-merging app/devices/device_profile_edit.php
CONFLICT (add/add): Merge conflict in app/devices/device_profile_edit.php
Auto-merging app/devices/device_profile_copy.php
CONFLICT (add/add): Merge conflict in app/devices/device_profile_copy.php
Auto-merging app/devices/device_edit.php
CONFLICT (add/add): Merge conflict in app/devices/device_edit.php
Auto-merging app/devices/device_dashboard.php
CONFLICT (add/add): Merge conflict in app/devices/device_dashboard.php
Auto-merging app/devices/app_menu.php
CONFLICT (add/add): Merge conflict in app/devices/app_menu.php
Auto-merging app/devices/app_languages.php
CONFLICT (add/add): Merge conflict in app/devices/app_languages.php
Auto-merging app/devices/app_config.php
CONFLICT (add/add): Merge conflict in app/devices/app_config.php
Auto-merging app/destinations/resources/classes/destinations.php
CONFLICT (add/add): Merge conflict in app/destinations/resources/classes/destinations.php
Auto-merging app/destinations/destinations.php
CONFLICT (content): Merge conflict in app/destinations/destinations.php
Auto-merging app/destinations/destination_imports.php
CONFLICT (add/add): Merge conflict in app/destinations/destination_imports.php
Auto-merging app/destinations/destination_edit.php
CONFLICT (add/add): Merge conflict in app/destinations/destination_edit.php
Auto-merging app/destinations/app_menu.php
CONFLICT (add/add): Merge conflict in app/destinations/app_menu.php
Auto-merging app/destinations/app_languages.php
CONFLICT (add/add): Merge conflict in app/destinations/app_languages.php
Auto-merging app/destinations/app_config.php
CONFLICT (content): Merge conflict in app/destinations/app_config.php
Auto-merging app/database_transactions/app_menu.php
CONFLICT (add/add): Merge conflict in app/database_transactions/app_menu.php
Auto-merging app/database_transactions/app_languages.php
CONFLICT (add/add): Merge conflict in app/database_transactions/app_languages.php
Auto-merging app/database_transactions/app_config.php
CONFLICT (add/add): Merge conflict in app/database_transactions/app_config.php
Auto-merging app/contacts/resources/images/icon_gmaps.png
CONFLICT (add/add): Merge conflict in app/contacts/resources/images/icon_gmaps.png
Auto-merging app/contacts/contacts.php
CONFLICT (content): Merge conflict in app/contacts/contacts.php
Auto-merging app/contacts/contact_urls.php
CONFLICT (add/add): Merge conflict in app/contacts/contact_urls.php
Auto-merging app/contacts/contact_times.php
CONFLICT (add/add): Merge conflict in app/contacts/contact_times.php
Auto-merging app/contacts/contact_settings.php
CONFLICT (add/add): Merge conflict in app/contacts/contact_settings.php
Auto-merging app/contacts/contact_relations.php
CONFLICT (add/add): Merge conflict in app/contacts/contact_relations.php
Auto-merging app/contacts/contact_phone_edit.php
CONFLICT (add/add): Merge conflict in app/contacts/contact_phone_edit.php
Auto-merging app/contacts/contact_notes.php
CONFLICT (content): Merge conflict in app/contacts/contact_notes.php
Auto-merging app/contacts/contact_import_google.php
CONFLICT (add/add): Merge conflict in app/contacts/contact_import_google.php
Auto-merging app/contacts/contact_emails.php
CONFLICT (add/add): Merge conflict in app/contacts/contact_emails.php
Auto-merging app/contacts/contact_edit.php
CONFLICT (add/add): Merge conflict in app/contacts/contact_edit.php
Auto-merging app/contacts/contact_attachments.php
CONFLICT (add/add): Merge conflict in app/contacts/contact_attachments.php
Auto-merging app/contacts/contact_addresses.php
CONFLICT (content): Merge conflict in app/contacts/contact_addresses.php
Auto-merging app/contacts/app_menu.php
CONFLICT (add/add): Merge conflict in app/contacts/app_menu.php
Auto-merging app/contacts/app_languages.php
CONFLICT (add/add): Merge conflict in app/contacts/app_languages.php
Auto-merging app/contacts/app_config.php
CONFLICT (content): Merge conflict in app/contacts/app_config.php
Auto-merging app/conferences_active/conference_interactive_inc.php
CONFLICT (content): Merge conflict in app/conferences_active/conference_interactive_inc.php
Auto-merging app/conferences_active/conference_exec.php
CONFLICT (content): Merge conflict in app/conferences_active/conference_exec.php
Auto-merging app/conferences_active/app_menu.php
CONFLICT (add/add): Merge conflict in app/conferences_active/app_menu.php
Auto-merging app/conferences_active/app_languages.php
CONFLICT (content): Merge conflict in app/conferences_active/app_languages.php
Auto-merging app/conferences_active/app_config.php
CONFLICT (content): Merge conflict in app/conferences_active/app_config.php
Auto-merging app/conferences/conferences.php
CONFLICT (content): Merge conflict in app/conferences/conferences.php
Auto-merging app/conferences/conference_edit.php
CONFLICT (content): Merge conflict in app/conferences/conference_edit.php
Auto-merging app/conferences/app_menu.php
CONFLICT (add/add): Merge conflict in app/conferences/app_menu.php
Auto-merging app/conferences/app_languages.php
CONFLICT (content): Merge conflict in app/conferences/app_languages.php
Auto-merging app/conferences/app_config.php
CONFLICT (content): Merge conflict in app/conferences/app_config.php
Auto-merging app/conference_profiles/conference_profiles.php
CONFLICT (add/add): Merge conflict in app/conference_profiles/conference_profiles.php
Auto-merging app/conference_profiles/conference_profile_params.php
CONFLICT (add/add): Merge conflict in app/conference_profiles/conference_profile_params.php
Auto-merging app/conference_profiles/app_menu.php
CONFLICT (add/add): Merge conflict in app/conference_profiles/app_menu.php
Auto-merging app/conference_profiles/app_languages.php
CONFLICT (add/add): Merge conflict in app/conference_profiles/app_languages.php
Auto-merging app/conference_profiles/app_config.php
CONFLICT (add/add): Merge conflict in app/conference_profiles/app_config.php
Auto-merging app/conference_controls/conference_controls.php
CONFLICT (add/add): Merge conflict in app/conference_controls/conference_controls.php
Auto-merging app/conference_controls/conference_control_details.php
CONFLICT (add/add): Merge conflict in app/conference_controls/conference_control_details.php
Auto-merging app/conference_controls/app_menu.php
CONFLICT (add/add): Merge conflict in app/conference_controls/app_menu.php
Auto-merging app/conference_controls/app_languages.php
CONFLICT (add/add): Merge conflict in app/conference_controls/app_languages.php
Auto-merging app/conference_controls/app_config.php
CONFLICT (add/add): Merge conflict in app/conference_controls/app_config.php
Auto-merging app/conference_centers/resources/classes/conference_centers.php
CONFLICT (add/add): Merge conflict in app/conference_centers/resources/classes/conference_centers.php
Auto-merging app/conference_centers/download.php
CONFLICT (add/add): Merge conflict in app/conference_centers/download.php
Auto-merging app/conference_centers/conference_sessions.php
CONFLICT (content): Merge conflict in app/conference_centers/conference_sessions.php
Auto-merging app/conference_centers/conference_session_details.php
CONFLICT (content): Merge conflict in app/conference_centers/conference_session_details.php
Auto-merging app/conference_centers/conference_rooms.php
CONFLICT (content): Merge conflict in app/conference_centers/conference_rooms.php
Auto-merging app/conference_centers/conference_room_edit.php
CONFLICT (content): Merge conflict in app/conference_centers/conference_room_edit.php
Auto-merging app/conference_centers/conference_centers.php
CONFLICT (content): Merge conflict in app/conference_centers/conference_centers.php
Auto-merging app/conference_centers/conference_center_edit.php
CONFLICT (content): Merge conflict in app/conference_centers/conference_center_edit.php
Auto-merging app/conference_centers/app_menu.php
CONFLICT (add/add): Merge conflict in app/conference_centers/app_menu.php
Auto-merging app/conference_centers/app_languages.php
CONFLICT (content): Merge conflict in app/conference_centers/app_languages.php
Auto-merging app/conference_centers/app_config.php
CONFLICT (content): Merge conflict in app/conference_centers/app_config.php
Auto-merging app/click_to_call/app_menu.php
CONFLICT (add/add): Merge conflict in app/click_to_call/app_menu.php
Auto-merging app/click_to_call/app_languages.php
CONFLICT (add/add): Merge conflict in app/click_to_call/app_languages.php
Auto-merging app/click_to_call/app_config.php
CONFLICT (content): Merge conflict in app/click_to_call/app_config.php
Auto-merging app/calls_active/calls_active_inc.php
CONFLICT (content): Merge conflict in app/calls_active/calls_active_inc.php
Auto-merging app/calls_active/app_menu.php
CONFLICT (add/add): Merge conflict in app/calls_active/app_menu.php
Auto-merging app/calls_active/app_languages.php
CONFLICT (content): Merge conflict in app/calls_active/app_languages.php
Auto-merging app/calls_active/app_config.php
CONFLICT (content): Merge conflict in app/calls_active/app_config.php
Auto-merging app/calls/calls.php
CONFLICT (content): Merge conflict in app/calls/calls.php
Auto-merging app/calls/call_edit.php
CONFLICT (content): Merge conflict in app/calls/call_edit.php
Auto-merging app/calls/app_menu.php
CONFLICT (add/add): Merge conflict in app/calls/app_menu.php
Auto-merging app/calls/app_languages.php
CONFLICT (content): Merge conflict in app/calls/app_languages.php
Auto-merging app/calls/app_config.php
CONFLICT (content): Merge conflict in app/calls/app_config.php
Auto-merging app/call_recordings/resources/classes/call_recordings.php
CONFLICT (add/add): Merge conflict in app/call_recordings/resources/classes/call_recordings.php
Auto-merging app/call_recordings/call_recordings.php
CONFLICT (add/add): Merge conflict in app/call_recordings/call_recordings.php
Auto-merging app/call_recordings/app_menu.php
CONFLICT (add/add): Merge conflict in app/call_recordings/app_menu.php
Auto-merging app/call_recordings/app_languages.php
CONFLICT (add/add): Merge conflict in app/call_recordings/app_languages.php
Auto-merging app/call_recordings/app_config.php
CONFLICT (add/add): Merge conflict in app/call_recordings/app_config.php
Auto-merging app/call_flows/resources/classes/call_flows.php
CONFLICT (add/add): Merge conflict in app/call_flows/resources/classes/call_flows.php
Auto-merging app/call_flows/call_flows.php
CONFLICT (content): Merge conflict in app/call_flows/call_flows.php
Auto-merging app/call_flows/call_flow_edit.php
CONFLICT (content): Merge conflict in app/call_flows/call_flow_edit.php
Auto-merging app/call_flows/app_menu.php
CONFLICT (add/add): Merge conflict in app/call_flows/app_menu.php
Auto-merging app/call_flows/app_languages.php
CONFLICT (add/add): Merge conflict in app/call_flows/app_languages.php
Auto-merging app/call_flows/app_config.php
CONFLICT (content): Merge conflict in app/call_flows/app_config.php
Auto-merging app/call_centers/call_center_queues.php
CONFLICT (add/add): Merge conflict in app/call_centers/call_center_queues.php
Auto-merging app/call_centers/call_center_queue_edit.php
CONFLICT (add/add): Merge conflict in app/call_centers/call_center_queue_edit.php
Auto-merging app/call_centers/call_center_agents.php
CONFLICT (add/add): Merge conflict in app/call_centers/call_center_agents.php
Auto-merging app/call_centers/call_center_agent_status.php
CONFLICT (add/add): Merge conflict in app/call_centers/call_center_agent_status.php
Auto-merging app/call_centers/app_menu.php
CONFLICT (add/add): Merge conflict in app/call_centers/app_menu.php
Auto-merging app/call_centers/app_languages.php
CONFLICT (add/add): Merge conflict in app/call_centers/app_languages.php
Auto-merging app/call_centers/app_config.php
CONFLICT (add/add): Merge conflict in app/call_centers/app_config.php
Auto-merging app/call_center_active/app_menu.php
CONFLICT (add/add): Merge conflict in app/call_center_active/app_menu.php
Auto-merging app/call_center_active/app_languages.php
CONFLICT (add/add): Merge conflict in app/call_center_active/app_languages.php
Auto-merging app/call_center_active/app_config.php
CONFLICT (content): Merge conflict in app/call_center_active/app_config.php
Auto-merging app/call_broadcast/call_broadcast_send.php
CONFLICT (content): Merge conflict in app/call_broadcast/call_broadcast_send.php
Auto-merging app/call_broadcast/call_broadcast_edit.php
CONFLICT (content): Merge conflict in app/call_broadcast/call_broadcast_edit.php
Auto-merging app/call_broadcast/call_broadcast.php
CONFLICT (content): Merge conflict in app/call_broadcast/call_broadcast.php
Auto-merging app/call_broadcast/app_menu.php
CONFLICT (add/add): Merge conflict in app/call_broadcast/app_menu.php
Auto-merging app/call_broadcast/app_languages.php
CONFLICT (content): Merge conflict in app/call_broadcast/app_languages.php
Auto-merging app/call_broadcast/app_config.php
CONFLICT (content): Merge conflict in app/call_broadcast/app_config.php
Auto-merging app/call_block/call_block_edit.php
CONFLICT (add/add): Merge conflict in app/call_block/call_block_edit.php
Auto-merging app/call_block/call_block.php
CONFLICT (add/add): Merge conflict in app/call_block/call_block.php
Auto-merging app/call_block/app_menu.php
CONFLICT (add/add): Merge conflict in app/call_block/app_menu.php
Auto-merging app/call_block/app_languages.php
CONFLICT (add/add): Merge conflict in app/call_block/app_languages.php
Auto-merging app/call_block/app_config.php
CONFLICT (add/add): Merge conflict in app/call_block/app_config.php
Auto-merging app/bridges/bridges.php
CONFLICT (add/add): Merge conflict in app/bridges/bridges.php
Auto-merging app/bridges/bridge_edit.php
CONFLICT (add/add): Merge conflict in app/bridges/bridge_edit.php
Auto-merging app/bridges/app_menu.php
CONFLICT (add/add): Merge conflict in app/bridges/app_menu.php
Auto-merging app/bridges/app_languages.php
CONFLICT (add/add): Merge conflict in app/bridges/app_languages.php
Auto-merging app/bridges/app_config.php
CONFLICT (add/add): Merge conflict in app/bridges/app_config.php
Auto-merging app/basic_operator_panel/app_menu.php
CONFLICT (add/add): Merge conflict in app/basic_operator_panel/app_menu.php
Auto-merging app/basic_operator_panel/app_languages.php
CONFLICT (add/add): Merge conflict in app/basic_operator_panel/app_languages.php
Auto-merging app/basic_operator_panel/app_config.php
CONFLICT (add/add): Merge conflict in app/basic_operator_panel/app_config.php
Auto-merging app/access_controls/app_menu.php
CONFLICT (add/add): Merge conflict in app/access_controls/app_menu.php
Auto-merging app/access_controls/app_languages.php
CONFLICT (add/add): Merge conflict in app/access_controls/app_languages.php
Auto-merging app/access_controls/app_config.php
CONFLICT (add/add): Merge conflict in app/access_controls/app_config.php
Auto-merging app/access_controls/access_controls.php
CONFLICT (add/add): Merge conflict in app/access_controls/access_controls.php
Auto-merging app/access_controls/access_control_nodes.php
CONFLICT (add/add): Merge conflict in app/access_controls/access_control_nodes.php
Auto-merging app/access_controls/access_control_edit.php
CONFLICT (add/add): Merge conflict in app/access_controls/access_control_edit.php
Auto-merging app/aastra/app_config.php
CONFLICT (add/add): Merge conflict in app/aastra/app_config.php
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 4359 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.
Result of Schema and Data Types checks:
SQL Changes:
ALTER TABLE v_call_broadcasts ADD broadcast_start_time numeric;
ALTER TABLE v_call_flows ADD call_flow_enabled text;
ALTER TABLE v_conference_rooms ADD moderator_endconf text;
ALTER TABLE v_conference_rooms ADD announce_name text;
ALTER TABLE v_conference_rooms ADD announce_count text;
ALTER TABLE v_conference_rooms ADD announce_recording text;
ALTER TABLE v_destinations ADD destination_condition_field text;
ALTER TABLE v_extensions ALTER COLUMN nibble_account TYPE text;
ALTER TABLE v_ivr_menus ADD ivr_menu_parent_uuid uuid;
ALTER TABLE v_ring_groups ADD ring_group_call_forward_enabled text;
ALTER TABLE v_countries RENAME COLUMN calling_code to country_code;
ALTER TABLE v_users ALTER COLUMN api_key TYPE text;