Merge Issue Fixed