routes conflict

routes.rb

Ror::Application.routes.draw do
  scope "/app" do
    match '/privacy' => 'home#privacy'
    match '/terms'   => 'home#terms'

    get "submit_goals/index"

    devise_for :users, :controllers => { :registrations => "users/registrations", :omniauth_callbacks => "users/omniauth_callbacks", :confirmations => "users/confirmations", :sessions => "users/sessions" }

    devise_scope :user do
      match '/after_sign_up' => 'users/registrations#after_sign_up', :as => :after_sign_up
      match '/parent_dashboard' => 'users/registrations#parent_dashboard', :as => :parent_dashboard
      match '/child_dashboard' => 'users/registrations#child_dashboard', :as => :child_dashboard
      match '/child_details' => "users/registrations#child_details", :as => :child_details
      match '/child_learning_amt_settings' => "users/registrations#child_learning_amt_settings", :as => :child_learning_amt_settings
      match '/update_learning_amt_limit' => "users/registrations#update_learning_amt_limit", :as => :update_learning_amt_limit
    end

<<<<<<< HEAD
    get '/profile_pictures/:id/avatars' => 'profile_pictures#avatars' # for displaying avatar image stored in the database
=======
  # testfoundry-guidelines
  match '/testfoundry/guidelines'               => 'testfoundry_guidelines#index'
  match '/testfoundry/guidelines/stages'        => 'testfoundry_guidelines#stages'
  match '/testfoundry/guidelines/quality'       => 'testfoundry_guidelines#quality'
  match '/testfoundry/guidelines/summary'       => 'testfoundry_guidelines#summary'
  match '/testfoundry/guidelines/tips'          => 'testfoundry_guidelines#tips'
  
  # testfoundry video playback and special characters
  match '/testfoundry/play'                     => 'testfoundry#unitplay'
  match '/testfoundry/specialchars'             => 'testfoundry#specialchars'

  match '/subscription/success' => 'subscription#success'
  match '/subscription/failed' => 'subscription#failed'
  match '/subscription/update_billing_info' => "subscription#update_billing_info"

  resources :learning_resources, only: [:index]

  match '/billing' => "billing#show", :as => :billing
  
  resources :subscriptions, :controller => :subscription, :only => [] do
    get '/billing_info_form' => "subscription#billing_info_form"
  end
>>>>>>> develop

    resources :family_members, :only => [] do
      collection do
        get 'render_list_or_form'
        put 'mass_update'
      end
    end

    resources :learning_resources, :only => [:show] do
      match '/preview'=> "learning_resources#preview"
    end

    # testfoundry-guidelines
    match '/testfoundry/guidelines'         => 'testfoundry_guidelines#index'
    match '/testfoundry/guidelines/stages'  => 'testfoundry_guidelines#stages'
    match '/testfoundry/guidelines/quality' => 'testfoundry_guidelines#quality'
    match '/testfoundry/guidelines/summary' => 'testfoundry_guidelines#summary'
    match '/testfoundry/guidelines/tips'    => 'testfoundry_guidelines#tips'
    # testfoundry video playback
    match '/testfoundry/play'               => 'testfoundry#unitplay'

    match '/subscription/success' => 'subscription#success'
    match '/subscription/failed' => 'subscription#failed'
    match '/subscription/update_billing_info' => "subscription#update_billing_info"

    resources :learning_resources, only: [:index]

    match '/billing' => "billing#show", :as => :billing

    resources :subscriptions, :controller => :subscription, :only => [] do
      get '/billing_info_form' => "subscription#billing_info_form"
    end

    resources :users do
      resource :subscription, :controller => "subscription" do
        get '/plans' => "subscription#plans", :as => :plans
        get '/update_plan' => "subscription#update_plan", :as => :update_plan
        get '/invoices' => "subscription#invoices", :as => :invoices
        post '/cancel' => "subscription#cancel", :as => :cancel
        post '/request_parent' => "subscription#request_parent", :as => :request_parent
      end
      collection do
        #      get 'gravatar_id_md5_hash'
        post 'unsubscribe_from_mailchimp_list' # for Mailchimp webhook
      end

      put '/update_goal_state' => "users#update_goal_state", :as => :update_goal_state
      get '/get_goal_state' => "users#get_goal_state", :as => :get_goal_state

      resources :goals do
        put '/update_basic_amount' => "goals#update_basic_amount", :as => :update_basic_amount
        put '/update_goal_name' => "goals#update_goal_name", :as => :update_goal_name
      end

<<<<<<< HEAD
      resources :submit_goals do
        get '/get_submit_recurrence' => "submit_goals#get_submit_recurrence", :as => :get_submit_recurrence
        put '/update_submit_recurrence' => "submit_goals#update_submit_recurrence", :as => :update_submit_recurrence
        put '/update_submit_amount' => "submit_goals#update_submit_amount", :as => :update_submit_amount
=======
    resources :learning_resources, :only => [:show] do
      get '/test' => "learning_resources#test", :as => :test
      put '/update_user_answer' => "learning_resources#update_user_answer", :as => :update_user_answer
      get 'test_completed'
      post 'invite_parents_and_submit_goals'
      get 'transition_to_quiz'
      get 'read_results_for_quiz'
      get 'find_quiz_result'
    end
>>>>>>> develop

        collection do
          get '/update_khan_academy' => "submit_goals#update_khan_academy"
        end
      end

<<<<<<< HEAD
      match 'submission' => 'submit_goals#submission', :as => :submission
      match 'final_submit' => 'submit_goals#final_submit', :as => :final_submit
=======
    resources :learning_login_users, only: :destroy do
      get 'verify_external_account_details'
    end

    match 'money_request' => 'invoices#money_request', :as => :money_request
    match 'send_money_request' => 'invoices#send_money_request', :as => :send_money_request
    post 'modify_amount' => 'invoices#modify_amount', :as => :modify_amount
    get 'transaction_history' => 'invoices#transaction_history', :as => :transaction_history
    put '/update_user_notes' => "learning_resources#update_user_notes", :as => :update_user_notes
    get '/get_user_notes' => "learning_resources#get_user_notes", :as => :get_user_notes
    get '/no_test' => "learning_resources#no_test", :as => :no_test

    # testfoundry (additional user subroutes below)
    resources :testfoundry do
      match '/unitcommon'  => "testfoundry#unitcommon"
      match '/unitcreate'  => "testfoundry#unitcreate"
      match '/unitimprove' => "testfoundry#unitimprove"
      match '/unitcomplete'=> "testfoundry#unitcomplete"
      match '/unitedit'    => "testfoundry#unitedit"
      match '/unitpreview' => "testfoundry#unitpreview"
      match '/mystats'     => "testfoundry#production_stats"
      match '/mybatch'     => "testfoundry#current_batch"
    end
>>>>>>> develop

      get '/get_total_amt' => "submit_goals#get_total_amt", :as => :get_total_amt
      get '/get_all_submit_goals' => "submit_goals#get_all_submit_goals", :as => :get_all_submit_goals
      get '/get_sub_submit_goals' => "submit_goals#get_sub_submit_goals", :as => :get_sub_submit_goals

      resources :learning_resources, :only => [:show] do
        get '/test' => "learning_resources#test", :as => :test
        put '/update_user_answer' => "learning_resources#update_user_answer", :as => :update_user_answer
      end

      resources :invoices do
        match 'approve' => 'invoices#approve', :as => :approve
        match 'pending' => 'invoices#pending', :as => :pending
        put 'update_invoice_holdback' => 'invoices#update_invoice_holdback', :as => :update_invoice_holdback
      end

      resources :learning_login_users, only: :destroy

      match 'money_request' => 'invoices#money_request', :as => :money_request
      match 'send_money_request' => 'invoices#send_money_request', :as => :send_money_request
      post 'modify_amount' => 'invoices#modify_amount', :as => :modify_amount
      get 'transaction_history' => 'invoices#transaction_history', :as => :transaction_history
      put '/update_user_notes' => "learning_resources#update_user_notes", :as => :update_user_notes
      get '/get_user_notes' => "learning_resources#get_user_notes", :as => :get_user_notes
      get '/no_test' => "learning_resources#no_test", :as => :no_test

      # testfoundry (additional user subroutes below)
      resources :testfoundry do
        match '/unitcommon'  => "testfoundry#unitcommon"
        match '/unitcreate'  => "testfoundry#unitcreate"
        match '/unitimprove' => "testfoundry#unitimprove"
        match '/unitcomplete'=> "testfoundry#unitcomplete"
        match '/unitedit'    => "testfoundry#unitedit"
        match '/unitpreview' => "testfoundry#unitpreview"
        match '/mystats'     => "testfoundry#production_stats"
        match '/mybatch'     => "testfoundry#current_batch"
      end

      # admin (additional user subroutes below)
      match '/admin/families'                   => "admin#families"
      match '/admin/users'                      => "admin#users"
      match '/admin/testmakers'                 => "admin#testmakers_index"
      match '/admin/testmakers/filter'          => "admin#testmakers_filter_submit"
      match '/admin/testmakers/production'      => "admin#testmakers_production"
      match '/admin/testmakers/interviews'      => "admin#testmakers_interviews"
      match '/admin/testmakers/printquery'      => "admin#testmakers_print_query"
      match '/admin/testmakers/recruiting'      => "admin#testmakers_recruiting"
      match '/admin/content'                    => "admin#content"
      match '/admin/testmakers/quiz-op'         => "admin#testmakers_quiz_op"
      match '/admin/testmakers/question-op'     => "admin#testmakers_question_op"
      match '/admin/testmakers/recruiting-op'   => "admin#testmakers_recruiting_op"
      match '/admin/testmakers/staff-op'        => "admin#testmakers_staff_op"

    end #users

    resources :invoices, :only => [:get_submit_goal_state, :update_submit_goal_state, :update_child_comment] do
      get '/get_submit_goal_state' => "invoices#get_submit_goal_state", :as => :get_submit_goal_state
      put '/update_submit_goal_state' => "invoices#update_submit_goal_state", :as => :update_submit_goal_state
      put '/update_child_comment' => "invoices#update_child_comment", :as => :update_child_comment
      put '/update_parent_comment' => "invoices#update_parent_comment", :as => :update_parent_comment
      put '/update_recommended_note' => "invoices#update_recommended_note", :as => :update_recommended_note
      put '/update_sponsor_amt' => "invoices#update_sponsor_amt", :as => :update_sponsor_amt
    end

    resources :invitations

    resources :submit_goals, :only => [:update_delete_state] do
      put '/update_delete_state' => "submit_goals#update_delete_state", :as => :update_delete_state
    end

    # ------------------------------------
    # begin homepage starts
    #
    # DEVNOTE: If you add or remove homepage routes, make sure you also change the special cased homepage
    #          layout selection for specifc homepage actions in HomeController::layout_by_auth (home_controller.rb)
    #
    root :to => 'home#landing' #redirect("/app/users/sign_in")
    match 'homepage/'     => 'home#landing'
    match 'about/'        => 'home#about'
    match 'contact/'      => 'home#contact'
    match 'faq/'          => 'home#faq'
    match 'features/'     => 'home#features'
    match 'how/'          => 'home#how'
    match 'parents/'      => 'home#parents'
    match 'plans/'        => 'home#plans'
    match 'press/'        => 'home#press'
    match 'teens/'        => 'home#teens'
    match 'testimonials/' => 'home#testimonials'

    # end homepage ends
    # -----------------------------------

    match 'home/' => 'home#index'
    match '/token' => 'home#token', :as => :token

    # Routes for API
    namespace :api do
      namespace :v1 do
        match '/login' => "users#login", :as => :login
        resources :users
      end
    end

    match ':action' => 'metriks#:action'
  end
end