styling
.idea files
merge conflict
remove .idea files from git