Modified playState and removed unneeded code
fixed conflict
level 1 update