Merged tree

This has all the merge conflicts resolve. Take a look at it. #7 #5