no message
Merge remote-tracking branch 'origin/HAXXXX'

Conflicts:
	demo project/Saved/Logs/MyProject5.log