20140719
reslove conflict
20140720