FILE FOR CONFLICT FROM FEATURE
