head conflicts fix