resolving a conflict with other feature