Fixed Merging Bug