Round ypoints when generating sample dict
Fix merge conflict in gensampledict