Diff/Merge directly integrated, no more needed
Use the built-in diff/merge patterns version