ConlictsResolveActivity is finished when the user cancels the ConflictsResolverDialog

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

@@ -62,6 +62,7 @@ public class ConflictsResolveActivity extends SherlockFragmentActivity implement
         
         switch (decision) {
             case CANCEL:
+                finish();
                 return;
             case OVERWRITE:
                 i.putExtra(FileUploader.KEY_FORCE_OVERWRITE, true);