Improve merge conflict messages for staging

When staging, merge conflict messages do not contain much information. Users should be notified better about their options. It is not always necessary to rebase. Staging may get 'cleared' after build completes. It should be visible, in detail, what causes the conflict.