Integration compact header

removed all conflict in all files also change id names