Fix conflicts

app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java

@@ -80,20 +80,13 @@ public class ContributionController {
         //FIXME: Starts gallery (opens Google Photos)
         Intent pickImageIntent = new Intent(ACTION_GET_CONTENT);
         pickImageIntent.setType("image/*");
-<<<<<<< HEAD
-        Timber.d("startGalleryPick() called with pickImageIntent");
-        // See https://stackoverflow.com/questions/22366596/android-illegalstateexception-fragment-not-attached-to-activity-webview
-        if (!fragment.isAdded()) {
-            return;
-        }
-=======
         // See https://stackoverflow.com/questions/22366596/android-illegalstateexception-fragment-not-attached-to-activity-webview
         if (!fragment.isAdded()) {
             Timber.d("Fragment is not added, startActivityForResult cannot be called");
             return;
         }
         Timber.d("startGalleryPick() called with pickImageIntent");
->>>>>>> directNearbyUploadsNewLocal
+
         fragment.startActivityForResult(pickImageIntent, SELECT_FROM_GALLERY);
     }
 
@@ -123,11 +116,9 @@ public class ContributionController {
                 if (isDirectUpload) {
                     shareIntent.putExtra("isDirectUpload", true);
                 }
-<<<<<<< HEAD
-=======
+
                 break;
             default:
->>>>>>> directNearbyUploadsNewLocal
                 break;
         }
         Timber.i("Image selected");

app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java

@@ -92,19 +92,8 @@ public class CommonsApplicationModule {
     }
 
     @Provides
-<<<<<<< HEAD
-    @Named("direct_nearby_upload_prefs")
-    public SharedPreferences providesDirectNearbyUploadPreferences() {
-        return application.getSharedPreferences("direct_nearby_upload_prefs", MODE_PRIVATE);
-    }
-
-    @Provides
-    public UploadController providesUploadController(SessionManager sessionManager, @Named("default_preferences") SharedPreferences sharedPreferences) {
-        return new UploadController(sessionManager, application, sharedPreferences);
-=======
     public UploadController providesUploadController(SessionManager sessionManager, @Named("default_preferences") SharedPreferences sharedPreferences, Context context) {
         return new UploadController(sessionManager, context, sharedPreferences);
->>>>>>> directNearbyUploadsNewLocal
     }
 
     @Provides

app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java

@@ -99,7 +99,7 @@ public class NearbyActivity extends NavigationBaseActivity implements LocationUp
             @Override
             public void onRefresh() {
                 lockNearbyView(false);
-                refreshView(true);
+                refreshView(false, LocationServiceManager.LocationChangeType.LOCATION_SIGNIFICANTLY_CHANGED);
             }
         });
 

app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java

@@ -54,10 +54,8 @@ import fr.free.nrw.commons.modifications.ModificationsContentProvider;
 import fr.free.nrw.commons.modifications.ModifierSequence;
 import fr.free.nrw.commons.modifications.ModifierSequenceDao;
 import fr.free.nrw.commons.modifications.TemplateRemoveModifier;
-<<<<<<< HEAD
-=======
+
 import fr.free.nrw.commons.utils.ImageUtils;
->>>>>>> directNearbyUploadsNewLocal
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import timber.log.Timber;
 
@@ -114,14 +112,10 @@ public class ShareActivity
     private String description;
     private Snackbar snackbar;
     private boolean duplicateCheckPassed = false;
-<<<<<<< HEAD
 
-    private boolean isNearbyUpload = false;
-
-=======
     private boolean haveCheckedForOtherImages = false;
     private boolean isNearbyUpload = false;
->>>>>>> directNearbyUploadsNewLocal
+
     /**
      * Called when user taps the submit button.
      */

app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java

@@ -1,10 +1,8 @@
 package fr.free.nrw.commons.upload;
 
 import android.annotation.SuppressLint;
-<<<<<<< HEAD
-=======
 import android.app.Activity;
->>>>>>> directNearbyUploadsNewLocal
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;