note to self
merge conflict
equation refs
change name of notebook