tiny revision on laptop before pulling from github. try the method of solving conflict
Merge branch 'master' of https://github.com/lunzhy/SimCTM