Resovled merge conflict in facet form
Merge pull request #6 from ding2tal/core-pr-6

Resovled merge conflict in facet form