merge all changes
delete conflict file
merge all changes
change database password
Merge branch 'list'

Conflicts:
	config/database.yml
	config/routes.rb
Gemfile commit
Merge branch 'HEAD' of https://github.com/bladelee/mydevise

Conflicts:
	Gemfile
	app/assets/javascripts/application.js
	config/routes.rb
commit Gemlock