fix bug 3.0 user2

Conflicts:
	rebase.txt
user1 fix bug 3.0

Conflicts:
	rebase.txt