Merge branch 'Isabelle_test'
tests
solving merge conflicts
Merge branch 'Isabelle_test_two'
merge
conflicts
Merge branch 'Isabelle_test_three'
tests
conflicts
conflicts
conflicts