diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index a47ee6628e..87e9b1649c 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -1893,6 +1893,7 @@ public class OsmandSettings {
 				if (ps.size() > index) {
 					ps.set(index, latLonNew);
 				}
+<<<<<<< 56c73430b940b4690ba7ddd2da9f14c234fc0155
 				ds.set(index, PointDescription.serializeToString(historyDescription));
 				if (cs.size() > index) {
 					cs.set(index, colorIndex);
@@ -1908,6 +1909,8 @@ public class OsmandSettings {
 					double lon = latLonNew.getLongitude();
 					SearchHistoryHelper.getInstance(ctx).addNewItemToHistory(lat, lon, historyDescription);
 				}
+=======
+>>>>>>> Fixes
 				return savePoints(ps, ds, cs, ns, bs);
 			} else {
 				return false;
diff --git a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
index 2d97e5a319..695cabd95c 100644
--- a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
@@ -537,7 +537,8 @@ public class ContextMenuLayer extends OsmandMapLayer {
 
 		boolean isObjectMovable(Object o);
 
-		void applyNewObjectPosition(@NonNull Object o, @NonNull LatLon position,
+		void applyNewObjectPosition(@NonNull Object o,
+									@NonNull LatLon position,
 									@Nullable ApplyMovedObjectCallback callback);
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/views/FavouritesLayer.java b/OsmAnd/src/net/osmand/plus/views/FavouritesLayer.java
index d70deac72f..7d5e8b4bde 100644
--- a/OsmAnd/src/net/osmand/plus/views/FavouritesLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/FavouritesLayer.java
@@ -246,7 +246,8 @@ public class FavouritesLayer extends OsmandMapLayer implements ContextMenuLayer.
 	}
 
 	@Override
-	public void applyNewObjectPosition(@NonNull Object o, @NonNull LatLon position,
+	public void applyNewObjectPosition(@NonNull Object o,
+									   @NonNull LatLon position,
 									   @Nullable ApplyMovedObjectCallback callback) {
 		boolean result = false;
 		if (o instanceof FavouritePoint) {
diff --git a/OsmAnd/src/net/osmand/plus/views/ImpassableRoadsLayer.java b/OsmAnd/src/net/osmand/plus/views/ImpassableRoadsLayer.java
index bd3b147dbd..1222db7bc8 100644
--- a/OsmAnd/src/net/osmand/plus/views/ImpassableRoadsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/ImpassableRoadsLayer.java
@@ -205,7 +205,8 @@ public class ImpassableRoadsLayer extends OsmandMapLayer implements
 	}
 
 	@Override
-	public void applyNewObjectPosition(@NonNull Object o, @NonNull LatLon position,
+	public void applyNewObjectPosition(@NonNull Object o,
+									   @NonNull LatLon position,
 									   @Nullable final ApplyMovedObjectCallback callback) {
 		if (o instanceof RouteDataObject) {
 			final RouteDataObject object = (RouteDataObject) o;