Solved merge conflict

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/SerializablePositionImpl.java

@@ -29,17 +29,10 @@ public class SerializablePositionImpl implements SerializablePosition {
     @Override
     public int hashCode() {
         final int prime = 31;
-        int result = 1;
-<<<<<<< HEAD
-        int temp = (int) latDeg;
+        int result = 1;
+        long temp = (int) latDeg;
         result = prime * result + (int) (temp ^ (temp >>> 32));
-        temp = (int) lngDeg;
-=======
-        long temp;
-        temp = (int) latDeg;
-        result = prime * result + (int) (temp ^ (temp >>> 32));
-        temp = (int) latDeg;
->>>>>>> placemark
+        temp = (int) latDeg;
         result = prime * result + (int) (temp ^ (temp >>> 32));
         return result;
     }
@@ -52,16 +45,10 @@ public class SerializablePositionImpl implements SerializablePosition {
             return false;
         if (getClass() != obj.getClass())
             return false;
-        SerializablePositionImpl other = (SerializablePositionImpl) obj;
-<<<<<<< HEAD
-        if (new Double(latDeg).equals(other.latDeg))
-            return false;
-        if (new Double(lngDeg).equals(other.lngDeg))
-=======
+        SerializablePositionImpl other = (SerializablePositionImpl) obj;
         if (!new Double(latDeg).equals(other.latDeg))
             return false;
-        if (!new Double(lngDeg).equals(other.lngDeg))
->>>>>>> placemark
+        if (!new Double(lngDeg).equals(other.lngDeg))
             return false;
         return true;
     }