fixed merge error for real