merge changes 

pseudocode