Removed conflict. Some renamings in the tree.
Removed Calc