Checking input state
Resolve merge comflict