before merge
merge commit
add type of holidays and tours to tours