database yml added in git ignore
conflict resolved