fix homepage merge error