merge my stuff

Are you trying to use a git submodule here?