Resovled merge conflict in facet form

Fixed error from last merge in PR5.