add conflict handler to travisPreviewCI.st