No javascript fix and merge conflit