Added tour for new users
Fixed conflict