Created 1st version of GenFsm
Fix merge conflict