Merge pull request #9137 from nextcloud/fix-npe-in-conflict-resolution-activity

Fix NPE in ConflictsResolveActivity

src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.java

@@ -176,11 +176,13 @@ public class ConflictsResolveActivity extends FileActivity implements OnConflict
         super.onStart();
         if (getAccount() == null) {
             finish();
+            return;
         }
 
         if (newFile == null) {
             Log_OC.e(TAG, "No file received");
             finish();
+            return;
         }
 
         if (existingFile == null) {