some small fixes/confconflicts
added olark engagement boilerplate