Conflicts resolved
Capsules Next/previous