Converted to class-based view
Merge