I made the website.
Fixing conflicts