Fix Merge Issues