Fixed merging proglems