Fix conflict. Do not let any HEAD in the code

[#80103796]