Cleaned up merge conflicts.