Added scaffold touristsite
resolved conflict