Fixed for the log e message.
However, I forget press the button to solve the conflict on the rebase
step.... I just type in the message.