Fixed unnecessary merge comments in global.h