fix merge conflict
fix header