got rid of erroneous submodule and added changes since branch created