Reverted travis merge error