Add a new option to show a complete list of conflicts or just bail out on first conflict.
Add a new option to show a complete list of conflicts or just bail out on first conflict.