diff --git a/MVMCoreUI/Molecules/StandardHeaderView.swift b/MVMCoreUI/Molecules/StandardHeaderView.swift
index 746d510c..e6d00efa 100644
--- a/MVMCoreUI/Molecules/StandardHeaderView.swift
+++ b/MVMCoreUI/Molecules/StandardHeaderView.swift
@@ -8,11 +8,7 @@
 
 import UIKit
 
-<<<<<<< HEAD
-public class StandardHeaderView: ViewConstrainingView {
-=======
 public class StandardHeaderView: ViewConstrainingView, ModelMoleculeViewProtocol {
->>>>>>> feature/models
     var line: Line?
     
     // MARK: - MVMCoreViewProtocol