Two data engineers are working on the same Databricks notebook in separate branches. Both have edited the same section of code. When one tries to merge the othe...