Added the ability to show diff on conflict