Changed comment on line five.
Resolved merge conflict. (Hopefully.)