Fixing merge conflicts
Fixing states, workflow