Fixed conflicts