Fix conflict head