Fixed conflicts.