Commit changes

- Delete ".idea/" folder
- Merge conflict