delete submodule
re-add submodule
Merge remote-tracking branch 'origin/master'