used assume unchanged; updated NTAna to be ignored
resolved conflict
gitignore fixed