Fixed merge conflict issues that broke the illustration button