what
Fixed merge issues with folders getting deleted