fix header links and names
fix header links and names
merged conflict