following Dullaghan guide and moved database.yml to gitignore
bring HEAD current for deploy
fix merge conflicts