Cleaned up some older merge conflicts.