fix merge media folder merge

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

@@ -237,7 +237,8 @@ public class FolderSyncActivity extends FileActivity implements FolderSyncAdapte
         for (MediaFolder mediaFolder : mediaFolders) {
             if (syncedFoldersMap.containsKey(mediaFolder.absolutePath+"-"+mediaFolder.type)) {
                 SyncedFolder syncedFolder = syncedFoldersMap.get(mediaFolder.absolutePath+"-"+mediaFolder.type);
-                syncedFoldersMap.remove(mediaFolder.absolutePath);
+                syncedFoldersMap.remove(mediaFolder.absolutePath+"-"+mediaFolder.type);
+
                 if (MediaFolder.CUSTOM == syncedFolder.getType()) {
                     result.add(createSyncedFolderWithoutMediaFolder(syncedFolder));
                 } else {
@@ -248,6 +249,10 @@ public class FolderSyncActivity extends FileActivity implements FolderSyncAdapte
             }
         }
 
+        for (SyncedFolder syncedFolder : syncedFoldersMap.values()) {
+            result.add(createSyncedFolderWithoutMediaFolder(syncedFolder));
+        }
+
         return result;
     }