removing rebase introduced error