Yes

I have
Merge remote-tracking branch 'origin/master'

Conflicts:
	PongMP/main.lua