step controller work
Fixing merge errors