Demo of merge conflicts for DFSI - View it on GitHub