Take the oldest version (fixing a merge conflict)