heroku configuration
.xml merge
.idea
 removed .idea files
ignore .idea