ORIG_HEAD
why conflict and merge?
first commit with submodule