uncommented merge changes