Resovled merge conflict in facet form