fixing merge issue with feature file.