diffrent version between local and remote
Merge remote-tracking branch 'origin'

Conflicts:
	learning_fetch