now containing both version of notebook with conflicts. diff for
notebooks does not alwasy look nice