fixed bad merge
site actually fixed