---
---
resolving merge conflict
corecting bug and adding check if file already exists