Made website flat
Removed merge conflicts