fix github merge issues