be1330ec89
* Remove hardcoded paths to fix randomly failing tests * Use correct function for merge path
* Remove hardcoded paths to fix randomly failing tests * Use correct function for merge path