Fixed commit conflicts.