Fixed merge error