Change test1.py one time
merge with --no-ff