merge conflict

gistfile1.txt

(zamboni)ngoke@mozzarella:~/Code/zamboni/apps$ git pull mozilla master
From github.com:mozilla/zamboni
 * branch            master     -> FETCH_HEAD
Auto-merging templates/qunit/qunit.html
CONFLICT (content): Merge conflict in templates/qunit/qunit.html
Auto-merging mkt/settings.py
Auto-merging mkt/inapp_pay/views.py
Auto-merging mkt/asset_bundles.py
Auto-merging mkt/account/views.py
Auto-merging media/js/zamboni/tests/install_button_tests.js
Auto-merging media/js/zamboni/buttons.js
Auto-merging media/js/mkt/buttons.js
Auto-merging media/js/mkt/apps.js
CONFLICT (content): Merge conflict in media/js/mkt/apps.js
Auto-merging docs/topics/api.rst
CONFLICT (add/add): Merge conflict in docs/topics/api.rst
Removing apps/amo/templates/services/plugin_check.xml
Automatic merge failed; fix conflicts and then commit the result.