Add additional merge info to pathmerge
15 files changed