Fixed conflicts?