fixed merge with pagination, portraits, and cleaner routes