add learning logs, 20140628
处理冲突问题