Fixing Code Merge Issues