Merge Issue Fixed

Merge Thing