Fixed one of merges.