Mid merge changes