# Conflicts: # _locales/en/messages.json # app/sql.js # js/background.js # js/conversation_controller.js # js/models/conversations.js # js/views/inbox_view.js # main.js