Can't merge the feature branch even if no conflict

I create a feature branch based on develop, and make some changes on feature branch. When I try to merge the feature branch to develop, the gitlab prompts that “Merge blocked: merge conflicts must be resolved”. But actually, there is no conflict between these two branch.

BTW, the issue occured after upgrade the Gitlab 15.6.0.

I am facing same issue. Did you find the solution?