Merged the two websites