fixed more merge conflic in header section