fix little merge error