add an option to choose the suffix for 2x images
Corrected merge conflict.