Cleaning merge conflicts
Adding no-cache imitation to parseFileTree