fixed public js after merge