path fixed, mis-merged