Add boolean ops
merge resolution