Resolved submodule error
Pull from origin fixed conflicts