don't test non-existing patching magic anymore
fixed typo in merge