First commit for github
Removed conflict from ini