working on building tree
resolved merge in .o