more exercises
sha conflict