D&C Done but there is a bug in merging