Fixed merge conflicts (for real this time).