- Resolved merge conflict
- removed unused files