Resolving conflicts
Added selection