Added information about rebase conflicts