merge with the old site