Urgent need graph fix and map before/after labels
simulate merge fixes