changes to loading lsat from lemma script
conflict resolution