Enable three way merge diffing