try
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/report/bypage.html.erb