Fixing app.config - for devs, we don't need auto = none
Fixing conflict resolver tests