Fixing bad github merge