Conflict merge

Here's the conflict merge.