took out turbolinks
fixed merge