Fixed Merging Issues