fixed hidden merge conflict in dashboard.erb
fixed an error of passing parameters of a button