Fixes typos in features
Fixes conflict