Fix conflicts.
Fix Electronic facet for databases and ejournals.
Fix conflicts.