fix and/or/not
merge