Merge branch 'en/merge-path-collision'