toString in Opreator
Merge conflicts