main.html merge fix