DEV-7 | Rebase merge lack the last line