fixed Merge issues. faces config was missing entries as a result of
merge