this is bugfix1
bugfix2 commmit
commit last
this is bugfix3 home.html
this is home.html
dddMerge branch 'bugfix3'

Conflicts:
	home.html