fix broken common.mk(bad merge)