Bugfix for merge errors and update openconext/engine-metadata