Add support for two off-canvas elements
Fix merge conflict