Added Select 2 and single row
Removed conflicts