new version of feature pages that resolves conflict