Fixing additional merge conflict issues.