Getting and restoring the original PATH. #30 #31
merge conflict fix