After resolving conflict in index.html with title commit by computer 1, computer 2 has forced use of computer 2.