merge conflict
learning epoch commit
merge
Merge branch 'RuiShu-master'
Reformat