Added rebase to my list
Fixed conflict