merged
fixed 1dollarscan