Fixed selecting.
Fixed merge conflicts