Fixing some lingering merge conflicts