ignore application.ini
merge conflict file git ignore