conflict 2 resolved Merge remote-tracking branch 'mitsuhiko/master'
conflict 2 resolved Merge remote-tracking branch 'mitsuhiko/master'

conflict 2 resolved Merge remote-tracking branch 'mitsuhiko/master'

hanteng/babel,hanteng/babel,hanteng/babel