fixed conflicts command to work when the conflicted state is caused by a rebase operation