Linux: added rebase in linux
Linux: merged using rebase