diff --git a/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java b/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java
index f6533b1cf8..0a35a90a9d 100644
--- a/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java
@@ -74,11 +74,7 @@ public class FavoritesLayer extends OsmandMapLayer implements ContextMenuLayer.I
 					int x = view.getRotatedMapXForPoint(o.getLatitude(), o.getLongitude());
 					int y = view.getRotatedMapYForPoint(o.getLatitude(), o.getLongitude());
 					canvas.drawBitmap(favoriteIcon, x - favoriteIcon.getWidth() / 2, 
-<<<<<<< HEAD
-							y - favoriteIcon.getHeight() , paint);
-=======
 							y - favoriteIcon.getHeight() / 2, paint);
->>>>>>> Update favorite icon
 				}
 			}
 		}