Automatically accepted conflicts have too much focus: 
Automatically accepted conflicts have too much focus:
