yes added
yes1 added
merged
committing after resolving conflicts
deleted about.txt