Split & Merge conflicts & resolution

Follow