fixed bug with hot deffered merges