python study
python test log
fix conflicts