Setup states
Fixed Merge Conflict