Fixed remaining conflicts.