Remove leftover conflict marker.
Update pres.md.