Testing merge conflicts
fixed merging
added merge mode
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Remotes.js