Merge mods
Tizgee_irs.module merge conflict
Modify .gitignore
Modify ignore and remove settings.php from db so that we don't get merge conflicts dues to permissions again. Just do changes to settings manually.
Put back settings.php