cleanup some errors in merging patches
3 files changed