Preparing for pull.
Resolving merge.
Fixing problem with deployment.
Adding database.