added snipmage submodule
fixed merge conflicts