cleaning code - more readable compilation WIP
resolved merge
node identification method
merge conflicts