packages removed
fixed merge conflicts