Fix a forgetten "<<<<<<< HEAD" after the last conflict