merged conflict home page again