i edited the gitignore and finished update and merge
trying to correct db yml prob