diff --git a/app/src/main/java/fr/free/nrw/commons/upload/FileUtils.java b/app/src/main/java/fr/free/nrw/commons/upload/FileUtils.java
index 652d1bfef..13056ad4b 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/FileUtils.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/FileUtils.java
@@ -23,7 +23,6 @@ import java.io.IOException;
 import java.nio.channels.FileChannel;
 import java.util.Date;
 
-import fr.free.nrw.commons.CommonsApplication;
 import timber.log.Timber;
 
 public class FileUtils {
@@ -98,15 +97,10 @@ public class FileUtils {
         }
         // File
         else if ("file".equalsIgnoreCase(uri.getScheme())) {
-<<<<<<< HEAD
             returnPath = uri.getPath();
         }
 
         if(returnPath == null) {
-=======
-            return uri.getPath();
-        } else {
->>>>>>> Made changes to ensure that when attempting to upload multiple images, the GPS data is extracted and attached correctly.
             //fetching path may fail depending on the source URI and all hope is lost
             //so we will create and use a copy of the file, which seems to work
             String copyPath = null;
@@ -114,12 +108,9 @@ public class FileUtils {
                 ParcelFileDescriptor descriptor
                         = context.getContentResolver().openFileDescriptor(uri, "r");
                 if (descriptor != null) {
-<<<<<<< HEAD
 
-=======
->>>>>>> Made changes to ensure that when attempting to upload multiple images, the GPS data is extracted and attached correctly.
                     SharedPreferences sharedPref = PreferenceManager
-                            .getDefaultSharedPreferences(CommonsApplication.getInstance());
+                            .getDefaultSharedPreferences(context);
                     boolean useExtStorage = sharedPref.getBoolean("useExternalStorage", true);
                     if (useExtStorage) {
                         copyPath = Environment.getExternalStorageDirectory().toString()
@@ -144,12 +135,10 @@ public class FileUtils {
                 Timber.w(e, "Error in file " + copyPath);
                 return null;
             }
-<<<<<<< HEAD
         } else {
             return returnPath;
-=======
->>>>>>> Made changes to ensure that when attempting to upload multiple images, the GPS data is extracted and attached correctly.
         }
+
         return null;
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/SimilarImageDialogFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/SimilarImageDialogFragment.java
new file mode 100644
index 000000000..a8f336927
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/upload/SimilarImageDialogFragment.java
@@ -0,0 +1,112 @@
+package fr.free.nrw.commons.upload;
+
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.graphics.drawable.VectorDrawableCompat;
+import android.support.v4.app.DialogFragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.Button;
+
+import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.facebook.imagepipeline.listener.RequestListener;
+import com.facebook.imagepipeline.listener.RequestLoggingListener;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+
+import fr.free.nrw.commons.R;
+
+/**
+ * Created by harisanker on 14/2/18.
+ */
+
+public class SimilarImageDialogFragment extends DialogFragment {
+    SimpleDraweeView originalImage;
+    SimpleDraweeView possibleImage;
+    Button positiveButton;
+    Button negativeButton;
+    onResponse mOnResponse;//Implemented interface from shareActivity
+    Boolean gotResponse = false;
+    public SimilarImageDialogFragment() {
+    }
+    public interface onResponse{
+        public void onPostiveResponse();
+        public void onNegativeResponse();
+    }
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View view =  inflater.inflate(R.layout.fragment_similar_image_dialog, container, false);
+        Set<RequestListener> requestListeners = new HashSet<>();
+        requestListeners.add(new RequestLoggingListener());
+
+        originalImage =(SimpleDraweeView) view.findViewById(R.id.orginalImage);
+        possibleImage =(SimpleDraweeView) view.findViewById(R.id.possibleImage);
+        positiveButton = (Button) view.findViewById(R.id.postive_button);
+        negativeButton = (Button) view.findViewById(R.id.negative_button);
+
+        originalImage.setHierarchy(GenericDraweeHierarchyBuilder
+                .newInstance(getResources())
+                .setPlaceholderImage(VectorDrawableCompat.create(getResources(),
+                        R.drawable.ic_image_black_24dp,getContext().getTheme()))
+                .setFailureImage(VectorDrawableCompat.create(getResources(),
+                        R.drawable.ic_error_outline_black_24dp, getContext().getTheme()))
+                .build());
+        possibleImage.setHierarchy(GenericDraweeHierarchyBuilder
+                .newInstance(getResources())
+                .setPlaceholderImage(VectorDrawableCompat.create(getResources(),
+                        R.drawable.ic_image_black_24dp,getContext().getTheme()))
+                .setFailureImage(VectorDrawableCompat.create(getResources(),
+                        R.drawable.ic_error_outline_black_24dp, getContext().getTheme()))
+                .build());
+
+        originalImage.setImageURI(Uri.fromFile(new File(getArguments().getString("originalImagePath"))));
+        possibleImage.setImageURI(Uri.fromFile(new File(getArguments().getString("possibleImagePath"))));
+
+        negativeButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mOnResponse.onNegativeResponse();
+                gotResponse = true;
+                dismiss();
+            }
+        });
+        positiveButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mOnResponse.onPostiveResponse();
+                gotResponse = true;
+                dismiss();
+            }
+        });
+        return view;
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mOnResponse = (onResponse) getActivity();//Interface Implementation
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        Dialog dialog = super.onCreateDialog(savedInstanceState);
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        return dialog;
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+//        I user dismisses dialog by pressing outside the dialog.
+        if(!gotResponse)
+            mOnResponse.onNegativeResponse();
+        super.onDismiss(dialog);
+    }
+}
diff --git a/app/src/test/java/fr/free/nrw/commons/TestCommonsApplication.java b/app/src/test/java/fr/free/nrw/commons/TestCommonsApplication.java
index 8606de912..6b9f583b4 100644
--- a/app/src/test/java/fr/free/nrw/commons/TestCommonsApplication.java
+++ b/app/src/test/java/fr/free/nrw/commons/TestCommonsApplication.java
@@ -15,6 +15,7 @@ import fr.free.nrw.commons.caching.CacheController;
 import fr.free.nrw.commons.data.DBOpenHelper;
 import fr.free.nrw.commons.di.CommonsApplicationComponent;
 import fr.free.nrw.commons.di.CommonsApplicationModule;
+import fr.free.nrw.commons.di.DaggerCommonsApplicationComponent;
 import fr.free.nrw.commons.location.LocationServiceManager;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import fr.free.nrw.commons.nearby.NearbyPlaces;