submodule conflict resolution