removed code from merge error
changed the way to get options