uups.. forgot to remove the HEAD tag from the past conflict