for merge to be possible
finally things are back to normal