error: patch failed: NEWS:20 error: NEWS: patch does not apply