bug correction for merge