Update sage.txt

resolved merge conflict in sage.txt