.
conflict fix

Conflicts:
	Views/Home/Index.cshtml