Fixed Merging error