diff --git a/src/plugins/qmlinspector/components/objecttree.cpp b/src/plugins/qmlinspector/components/objecttree.cpp
index 05f4fc2d18e913872e71f1f402b854ae659741ad..7c1537567225fe8ec504871e14e6853bae1c5742 100644
--- a/src/plugins/qmlinspector/components/objecttree.cpp
+++ b/src/plugins/qmlinspector/components/objecttree.cpp
@@ -38,8 +38,6 @@
 
 #include "objecttree.h"
 
-Q_DECLARE_METATYPE(QmlDebugObjectReference)
-
 ObjectTree::ObjectTree(QmlEngineDebug *client, QWidget *parent)
     : QTreeWidget(parent),
       m_client(client),
diff --git a/src/plugins/qmlinspector/inspectoroutputpane.cpp b/src/plugins/qmlinspector/inspectoroutputwidget.cpp
similarity index 98%
rename from src/plugins/qmlinspector/inspectoroutputpane.cpp
rename to src/plugins/qmlinspector/inspectoroutputwidget.cpp
index 38fc464931d516168143c44a8589e3a4a4ecddc3..6b891974ec8168fad4db33a61eb76499e8024ae1 100644
--- a/src/plugins/qmlinspector/inspectoroutputpane.cpp
+++ b/src/plugins/qmlinspector/inspectoroutputwidget.cpp
@@ -26,7 +26,7 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 **
 **************************************************************************/
-#include "inspectoroutputpane.h"
+#include "inspectoroutputwidget.h"
 #include <coreplugin/coreconstants.h>
 
 #include <QtGui/QTextEdit>
diff --git a/src/plugins/qmlinspector/inspectoroutputpane.h b/src/plugins/qmlinspector/inspectoroutputwidget.h
similarity index 100%
rename from src/plugins/qmlinspector/inspectoroutputpane.h
rename to src/plugins/qmlinspector/inspectoroutputwidget.h
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index 87ff6de3575b38a1add1835710c117928717f9db..c738c6c2ce3d0f4b3d10b04c9647e50c6e6e53cc 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -31,8 +31,6 @@
 #include "qmlprojectfile.h"
 #include "qmlprojectmanagerconstants.h"
 #include "fileformat/qmlprojectitem.h"
-
-//<<<<<<< HEAD:src/plugins/qmlprojectmanager/qmlproject.cpp
 #include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/filewatcher.h>
 #include <qmljseditor/qmljsmodelmanagerinterface.h>
@@ -44,65 +42,6 @@
 namespace QmlProjectManager {
 
 QmlProject::QmlProject(Internal::Manager *manager, const QString &fileName)
-/*=======
-#include "qmlinspector/qmlinspector.h"
-#include "qmlinspector/qmlinspectorconstants.h"
-
-#include <debugger/debuggeruiswitcher.h>
-#include <projectexplorer/toolchain.h>
-#include <projectexplorer/persistentsettings.h>
-#include <projectexplorer/projectexplorerconstants.h>
-#include <extensionsystem/pluginmanager.h>
-#include <utils/pathchooser.h>
-#include <utils/qtcassert.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/editormanager/ieditor.h>
-
-#include <qmljseditor/qmlmodelmanagerinterface.h>
-
-#include <utils/synchronousprocess.h>
-
-#include <QtCore/QtDebug>
-#include <QtCore/QDir>
-#include <QtCore/QSettings>
-#include <QtCore/QProcess>
-#include <QtCore/QCoreApplication>
-
-#include <QtGui/QFormLayout>
-#include <QtGui/QMainWindow>
-#include <QtGui/QComboBox>
-#include <QtGui/QMessageBox>
-#include <QtGui/QLineEdit>
-#include <QtGui/QLabel>
-#include <QtGui/QSpinBox>
-
-#include <QtDeclarative/QmlComponent>
-
-using namespace QmlProjectManager;
-using namespace QmlProjectManager::Internal;
-using namespace ProjectExplorer;
-
-namespace {
-const char * const QML_RC_ID("QmlProjectManager.QmlRunConfiguration");
-const char * const QML_RC_DISPLAY_NAME(QT_TRANSLATE_NOOP("QmlProjectManager::Internal::QmlRunConfiguration", "QML Viewer"));
-
-const char * const QML_VIEWER_KEY("QmlProjectManager.QmlRunConfiguration.QmlViewer");
-const char * const QML_VIEWER_ARGUMENTS_KEY("QmlProjectManager.QmlRunConfiguration.QmlViewerArguments");
-const char * const QML_MAINSCRIPT_KEY("QmlProjectManager.QmlRunConfiguration.MainScript");
-const char * const QML_DEBUG_SERVER_ADDRESS_KEY("QmlProjectManager.QmlRunConfiguration.DebugServerAddress");
-const char * const QML_DEBUG_SERVER_PORT_KEY("QmlProjectManager.QmlRunConfiguration.DebugServerPort");
-
-const int DEFAULT_DEBUG_SERVER_PORT(3768);
-} // namespace
-
-////////////////////////////////////////////////////////////////////////////////////
-// QmlProject
-////////////////////////////////////////////////////////////////////////////////////
-
-QmlProject::QmlProject(Manager *manager, const QString &fileName)
->>>>>>> debugintegration:src/plugins/qmlprojectmanager/qmlproject.cpp
-*/
     : m_manager(manager),
       m_fileName(fileName),
       m_modelManager(ExtensionSystem::PluginManager::instance()->getObject<QmlJSEditor::ModelManagerInterface>()),