Fix previously conflicted feature file