Debugging
Post merge commit
lib/data-models/database.rb
Pre-merge commit
Changes to user and database