stop markers from stacking
fix merge