Fix image editor after merge