remove head conflicts