Submodule conflict message changed to display current submodule hash