Make pathmerge robost
8 files changed