fix rebase conflict
refactor options