added data to leaf 1
more testdata on leaves
added root data and changed leaves
tried to add potentially conflicting changes
Merge commit '60823d8de08829d33dc2d35117626ead5bf44e97'