sample.py
second.py
somedata
Merge branch 'next' into dev
edit sample.py
edit sample.py
solve the conflict