additional merge changes