changeState edited
MERGE