fix github merge breaks