move dangling call out of the way
reverse sense of test
manual merge
manual merge