clone CodeStore on mac
idea config file
branch test
test冲突练习
冲突练习 master
conflict fixed