added handlebars integration to database
fixed conflicts