diff --git a/MonoStockPortfolio/Activites/ConfigActivity.cs b/MonoStockPortfolio/Activites/ConfigActivity.cs
index 7388e6b..edee878 100644
--- a/MonoStockPortfolio/Activites/ConfigActivity.cs
+++ b/MonoStockPortfolio/Activites/ConfigActivity.cs
@@ -4,17 +4,10 @@ using Android.App;
 using Android.Content;
 using Android.OS;
 using Android.Preferences;
-<<<<<<< HEAD
 using MonoStockPortfolio.Core;
 using MonoStockPortfolio.Core.Config;
 using MonoStockPortfolio.Entities;
 using MonoStockPortfolio.Framework;
-=======
-using MonoStockPortfolio.Core.Config;
-using MonoStockPortfolio.Entities;
-using MonoStockPortfolio.Framework;
-using MonoStockPortfolio.Core;
->>>>>>> develop
 
 namespace MonoStockPortfolio.Activites
 {