Fixed saving and reloading illustrations
Resolve merge conflict