small merge changes