Fixed Merging
Fixed merging