there was a merge problem, so trying to sort out the submodule state...