Fixed Merge Issue