Fix Merge Conflicts