แก้
Merge remote-tracking branch 'origin/master'

Conflicts:
	New Microsoft Word Document.docx