Added beginning descriptions
fixed merge conflicts