removed extra optiosn
fixed select bug
Conflict resloveld