commit logs
Resolve conflicts
Added pagination class