Added basic functions for the symbol tree
Resolved conflicts