The two companies teamed up to try and put a lid on the long-running debate over how to pronounce “gif.”