'OR' support prototype
merge conflict fix