change default resolution value to None
Fix bug introduced by similarity fix
Merge branch 'master' into discrim
Merge branch 'discrim' into resolution
resolution for infer