getting the header and footer changes
resolved conflicts