bug fix
Merge branch 'flatten'
clear master
reset master
bug fix