fixed merge error