Some minor changes to sync the sample with the conflicts tutorial