Improving diffconflicts to handle diff3 conflictstyle