Fixed merge conflict
Removed .idea files