solutions to some exercises
sha conflict