* revert to fast merge for OR and NOT
* update README