rebase: remove merges_option and a blank line