Home is where the conflict isn't

Conflict resolution on home.html