fixed conflicts command to work when the conflicted state is caused by a rebase operation
Merge remote-tracking branch 'origin/pr/609'