Change the 'conflict' colour to yellow-orange
Fix #9, or at least I think this works okay