update
conflict resolve
Merge branch 'master' of https://github.com/hycis/conditional_computation
Merge branch 'master' of https://github.com/hycis/conditional_computation