added about
merge conflicts resolved