Allow for selection of merge base if not unique

Allow user to select commit to use for merge base in there is not a unique merge base.