Added test for conflict case on remote folder deletion