Deleted .idea folder
Added files to gitignore file
Fixed Conflicts