cleaning up dir
fix conflict