Appease the Travis gods after a merge conflict fail.