fix compile errors caused by merge conflict resolution