fix the submodule conflit and fix the coq import bug
fix the submodule conflit and fix the coq import bug

GaloisInc/saw-script,GaloisInc/saw-script,GaloisInc/saw-script,GaloisInc/saw-script,GaloisInc/saw-script