CollectAllTheStars2 - Adding a new activity to select the snapshot to use in case of a conflict.
CollectAllTheStars2 - Adding a new activity to select the snapshot to use in case of a conflict.