commit after submodule init
resole conflict on same line