Option to set conflict handler on compile

Or even during the normal run with an environment variable, but that's not
documented yet.
Merge branch 'feature/auto-answer-conflict-on-compile'