Fixed merging, should good.