Correcting Merge Issue