Fixed Merge Issues