References updated after merge