corrected github merge