what are these files, what does it mean?
Merge remote-tracking branch 'origin/master'

Conflicts:
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/shadercompiler-1.log