javascript - Rails 4 - Application.js contains merge conflicts, not sure how to resolve them -

i have rails app in application.js generated sprocket somehow got merge conflicts - , i'm not sure how remove them. in chrome the following error:

uncaught syntaxerror: unexpected token << 

and can see included in file:

[...] <<<<<<< head  //= require turbolinks //= require jquery.turbolinks //= require chosen-jquery ======= >>>>>>> 9e6c961b13c6c09da1cb8cdc055c799b829ff824 //= require jquery.purr [...] 

but can't see merge conflicts in own application.js file (not generated one).

i have tried both rake assets:clean, rake assets:precompile , rake assets:clobber without success.

any ideas on how can rid of these errors?

update clarification

this how manual (not generated sprockets) application.js file looks like:

//= require jquery //= require jquery.turbolinks //= require jquery_ujs //= require chosen-jquery //= require scaffold //= require jquery.purr //= require best_in_place //= require bootstrap-datepicker //= require jquery-fileupload //= require autocomplete-rails //= require jquery-ui //= require bootstrap //= require jquery.countdown //= require autocomplete-rails //= require bootstrapvalidator.min  //= require turbolinks  //= require_tree . 

so, no merge conflicts in file, rather in file gets generated sprockets gem.

can mention had merge conflict in "manual" application.js file, error / conflict persists reason in file generated sprockets - , i'm not sure how remove it.

the merge conflicts solves manually. make sure application.js looks before doing git add app/assets/javascripts/application.js && git commit

i believe application.js file should looks this:

[...] //= require turbolinks //= require jquery.turbolinks //= require chosen-jquery //= require jquery.purr [...]