working fsm?
fixed conflicts