fix for merge point check