merge common.h manually