code eaten by rebase/merge