Update prontera.txt

resolved merge conflicts in prontera.txt