Remove logical ops, cleanup merge conflicts