merging
merging / resolving tour-slide conflict.