Implemented merge function
Merge branch 'feature/octree' of github.com:DelftSolutions/jaws into feature/octree