merge path fix