post-merge path fix