Added settings file to app
fixed conflict