merge conflicts

conflicts.txt

From bitbucket.org:eproduce/twitch_extension_backend
 * branch            master     -> FETCH_HEAD
Auto-merging uploads/quest/img02_1_preview.webp
CONFLICT (add/add): Merge conflict in uploads/quest/img02_1_preview.webp
Auto-merging uploads/quest/img02_1.webp
CONFLICT (add/add): Merge conflict in uploads/quest/img02_1.webp
Auto-merging uploads/quest/img01_1_preview.png
CONFLICT (add/add): Merge conflict in uploads/quest/img01_1_preview.png
Auto-merging uploads/quest/img01_1.jpg
CONFLICT (add/add): Merge conflict in uploads/quest/img01_1.jpg
Auto-merging protected/views/_emails/win0.php
CONFLICT (add/add): Merge conflict in protected/views/_emails/win0.php
Auto-merging protected/views/_emails/_signup.php
CONFLICT (add/add): Merge conflict in protected/views/_emails/_signup.php
Auto-merging protected/views/_emails/_layout.php
CONFLICT (add/add): Merge conflict in protected/views/_emails/_layout.php
Auto-merging protected/modules/quiz/config.php
CONFLICT (add/add): Merge conflict in protected/modules/quiz/config.php
Auto-merging protected/modules/quiz/commands/QuizController.php
CONFLICT (add/add): Merge conflict in protected/modules/quiz/commands/QuizController.php
Auto-merging protected/modules/quiz/Module.php
CONFLICT (add/add): Merge conflict in protected/modules/quiz/Module.php
Auto-merging protected/modules/quiz/Helper.php
CONFLICT (add/add): Merge conflict in protected/modules/quiz/Helper.php
Auto-merging protected/modules/admin/views/layouts/main.php
CONFLICT (add/add): Merge conflict in protected/modules/admin/views/layouts/main.php
Auto-merging protected/modules/admin/views/default/index.php
CONFLICT (add/add): Merge conflict in protected/modules/admin/views/default/index.php
Auto-merging protected/modules/admin/controllers/DefaultController.php
CONFLICT (add/add): Merge conflict in protected/modules/admin/controllers/DefaultController.php
Auto-merging protected/models/User.php
CONFLICT (add/add): Merge conflict in protected/models/User.php
Auto-merging protected/models/RelQuizUser.php
CONFLICT (add/add): Merge conflict in protected/models/RelQuizUser.php
Auto-merging protected/models/CodeFrag.php
CONFLICT (add/add): Merge conflict in protected/models/CodeFrag.php
Auto-merging protected/models/Code.php
CONFLICT (add/add): Merge conflict in protected/models/Code.php
Auto-merging protected/models/Api.php
CONFLICT (add/add): Merge conflict in protected/models/Api.php
Auto-merging protected/controllers/TestController.php
CONFLICT (add/add): Merge conflict in protected/controllers/TestController.php
Auto-merging protected/controllers/SiteController.php
CONFLICT (add/add): Merge conflict in protected/controllers/SiteController.php
Auto-merging protected/config/web.php
CONFLICT (add/add): Merge conflict in protected/config/web.php
Auto-merging protected/config/db.php
CONFLICT (add/add): Merge conflict in protected/config/db.php
Auto-merging protected/config/console.php
CONFLICT (add/add): Merge conflict in protected/config/console.php
Auto-merging protected/composer.lock
CONFLICT (add/add): Merge conflict in protected/composer.lock
Auto-merging protected/composer.json
CONFLICT (add/add): Merge conflict in protected/composer.json
Auto-merging protected/components/Mail.php
CONFLICT (add/add): Merge conflict in protected/components/Mail.php
Auto-merging protected/components/Inpay.php
CONFLICT (add/add): Merge conflict in protected/components/Inpay.php
Auto-merging protected/components/BaseController.php
CONFLICT (add/add): Merge conflict in protected/components/BaseController.php
Auto-merging protected/commands/SocketController.php
CONFLICT (add/add): Merge conflict in protected/commands/SocketController.php
Auto-merging index.php
CONFLICT (add/add): Merge conflict in index.php
Auto-merging .htaccess
CONFLICT (add/add): Merge conflict in .htaccess
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Automatic merge failed; fix conflicts and then commit the result.
bash-4.2$