removed head file conflicts