merge changes 2