Improved conflict reporting