included .idea in git ignore file
Included .DS_Store in gitignore file
Resolved the conflict