Auto-merging themes/default/css.php
CONFLICT (add/add): Merge conflict in themes/default/css.php
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/functions.php
CONFLICT (add/add): Merge conflict in resources/functions.php
Auto-merging resources/classes/token.php
CONFLICT (add/add): Merge conflict in resources/classes/token.php
Auto-merging resources/classes/menu.php
CONFLICT (add/add): Merge conflict in resources/classes/menu.php
Auto-merging resources/app_languages.php
CONFLICT (add/add): Merge conflict in resources/app_languages.php
Auto-merging core/users/user_edit.php
CONFLICT (add/add): Merge conflict in core/users/user_edit.php
Auto-merging core/users/app_config.php
CONFLICT (content): Merge conflict in core/users/app_config.php
Auto-merging core/menu/menu.php
CONFLICT (content): Merge conflict in core/menu/menu.php
Auto-merging app/xml_cdr/xml_cdr.php
CONFLICT (content): Merge conflict in app/xml_cdr/xml_cdr.php
Auto-merging app/voicemails/voicemail_edit.php
CONFLICT (add/add): Merge conflict in app/voicemails/voicemail_edit.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/extensions/extension_edit.php
CONFLICT (content): Merge conflict in app/extensions/extension_edit.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/devices/device_edit.php
CONFLICT (add/add): Merge conflict in app/devices/device_edit.php
Auto-merging app/devices/app_config.php
CONFLICT (add/add): Merge conflict in app/devices/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_languages.php
CONFLICT (content): Merge conflict in app/conferences_active/app_languages.php
Auto-merging app/call_block/call_block_edit.php
CONFLICT (add/add): Merge conflict in app/call_block/call_block_edit.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 4336 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.