adding multiple selections
fix merge conflicts