Adding git rebase command.
fix conflict.