merge fixes and fix 3 failing test
false if never truthy