Added review functionality
Resolved conflicts