merged conflict home page