If nothing changed since my PR, it will merge both, so you keep your current gallery but it will additionally show olas events. So users can decide wether they keep their (for now ametyhst only) gallery or move over to kind 20 (with at least 2 clients supporting it)