commented fragments
fixed merge conflicts