[ai-0.36-95] fix wrong merge