database.yml change
merge conflicts
responsive css added for my account section