Resolve completely trivial alleged conflict that git should have been able to handle...