Update submodules
Add 3 way diff marker to merge conflicts