git submodule update --remote
Merge conflicts