fix compile after merge