Travis: Initiating build for commit 'b0967675950f9077fdd4d0cb2867a0f9eb3822e2' on branch 'tmp-path': Fixed a merge failure