remove submodule
removed media from tracking
fixing submodule
resolving conflicts