fix merge conflict

no more head!