working with one selection
fixed merge conflict