Optimizing the query
Uncommenting the method
Resolving conflicts