del clone
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/caofei/feedc/ThreadFetchContent.java