缓存改动
resolve conflict
modify the allchat.cfg
temp commit