merge + comment js path fix