add a test.py
add a value
new branch
new test
conflict_one
conflict two
Revert "conflict_one"

This reverts commit 3f9fb321dbd89403bccfb2523c11aa0370c8fd4e.

Conflicts:

	test.py
Merge github.com:lxg19880914/test