diff --git a/src/bin/projectclip.h b/src/bin/projectclip.h
index 09be0aea948dc77d19a3ad1e0a5e67e83d17051d..6fcae571afc0878b3f105a479ce5f4b3e82f68ea 100644
--- a/src/bin/projectclip.h
+++ b/src/bin/projectclip.h
@@ -294,13 +294,9 @@ private:
     QFuture<void> m_thumbThread;
     QList<int> m_requestedThumbs;
     const QString geometryWithOffset(const QString &data, int offset);
-<<<<<<< HEAD
-=======
     QMap <QString, QByteArray> m_audioLevels;
     /** @brief If true, all timeline occurences of this clip will be replaced from a fresh producer on reload. */
     bool m_resetTimelineOccurences;
->>>>>>> a12ba6dfa... When switching project profile and there is only 1 clip in timeline, update the timeline clip duration accordingly to profile change.
-
     // This is a helper function that creates the disabled producer. This is a clone of the original one, with audio and video disabled
     void createDisabledMasterProducer();