Add more info about diff and merge conflicts