added binary ops
fixed merging