Added a title to the header
Resolved conflicts in header and database files