new line got missing during rebase