shell笔记
solve confict