from IDE
from IDE
my commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	newFile.txt