Added feature list in config
Resolved conflict