i thought if i edited travis in the merge but no