Added Anaconda to PATH
fix merge conflict for Anaconda