git pull issue. Please advice

[Svemar]

Hi, tried 'git pull' once more with the results below:

[root@dsrl corebos]# git pull corebos master
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:

git config pull.rebase false # merge (the default strategy)
git config pull.rebase true # rebase
git config pull.ff only # fast-forward only

You can replace "git config" with "git config --global" to set a default
preference for all repositories. You can also pass --rebase, --no-rebase,
or --ff-only on the command line to override the configured default per
invocation.

remote: Enumerating objects: 28, done.
remote: Counting objects: 100% (28/28), done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 28 (delta 20), reused 26 (delta 20), pack-reused 0
Unpacking objects: 100% (28/28), 7.54 KiB | 701.00 KiB/s, done.
From https://github.com/tsolucio/corebos
* branch master -> FETCH_HEAD
a6ed4400e..90f9206d4 master -> corebos/master
Auto-merging vtlib/Vtiger/Cron.php
CONFLICT (add/add): Merge conflict in vendor/stefangabos/zebra_session/Zebra_Session.php
Auto-merging vendor/stefangabos/zebra_session/Zebra_Session.php
Auto-merging modules/com_vtiger_workflow/language/es_es.fndefs.php
Auto-merging modules/com_vtiger_workflow/language/en_us.fndefs.php
Auto-merging modules/com_vtiger_workflow/expression_functions/application.php
Auto-merging modules/com_vtiger_workflow/expression_engine/VTExpressionsManager.inc
Auto-merging modules/com_vtiger_workflow/expression_engine/VTExpressionEvaluater.inc
CONFLICT (rename/rename): Rename "modules/Services/AddServiceToPriceBooks.php"->"modules/TCTotals/FindDuplicateRecords.php" in branch "HEAD" rename "modules/Services/AddServiceToPriceBooks.php"->"modules/pricebookproductrel/FindDuplicateRecords.php" in "90f9206d4c083105b35fbf8963b6b7b23ae302c9"
Auto-merging modules/TCTotals/FindDuplicateRecords.php and modules/pricebookproductrel/FindDuplicateRecords.php, both renamed from modules/Services/AddServiceToPriceBooks.php
Auto-merging modules/pricebookproductrel/FindDuplicateRecords.php
Auto-merging modules/AutoNumberPrefix/FindDuplicateRecords.php
Auto-merging include/Webservices/Logout.php
CONFLICT (content): Merge conflict in include/Webservices/Logout.php
Automatic merge failed; fix conflicts and then commit the result.
---------------
Advice, please