diff --git a/src/CraneCtld/AccountManager.cpp b/src/CraneCtld/AccountManager.cpp
index db4c0054..5dc623c3 100644
--- a/src/CraneCtld/AccountManager.cpp
+++ b/src/CraneCtld/AccountManager.cpp
@@ -18,13 +18,7 @@
 
 #include "AccountManager.h"
 
-<<<<<<< HEAD
-=======
-#include <string>
-
 #include "AccountMetaContainer.h"
-#include "crane/PasswordEntry.h"
->>>>>>> a324eeb (refactor)
 #include "protos/PublicDefs.pb.h"
 #include "range/v3/algorithm/contains.hpp"