merging galleria fix