merge fixed site from spoffy