fixed false merging