more work done on the website
fixing file conflicts
more conflict fixing