test conflict
Start a feature
Finish a feature, with new file cc.py
add conflict from crazy