Fixed merge error.