fixing merge changes