fix common.c merge derp