Implementation
Removed unused class
Feedback (type in docblock)
Resolved conflicts