Fixed merge conflict
Fixed missing closing bracket in css, amended hheader nav styling