Remove the latest merge from  branch 'ft' of github.com:jianfu/mgsim