fixed merging issues, removed turbolinks