turbolinks compatible js
fixed merge conflicts