Corrected conflicts caused during merge.
"0.2.5"