Do not track database.yml
Installed check gems.
Resolved merge conflicts.