用来冲突的提交.
Merge origin/master

Conflicts:
	web/index.xhtml