merge conflict
merge conflict
in process of fixing selection
fixed bug with selection