More merge changes