resolved merge conflict with Sass file in relation to headings  ditto in  nhs_application.css
resolved merge conflict with Sass file in relation to headings  ditto in  nhs_application.css

nhsbsa/nhslis,nhsbsa/nhslis,nhsbsa/nhslis,nhsbsa/nhslis