rebase and correct merge fails