Merge conflict?

Please resolve.