Conflict folder deleted