3rd round of merge conflicts