Fixing git rebase corruption
Signed-off-by:thehutch