Saving to PNG
Conflicts resolved