the application.rb has been updated to get rid of the merge tags and the lines properly merged for the languages