new modifed header
After Conflit