Added timeout dir deletion.
Fixed merge conflict.