Added Recommended Feature
Solved Conflict