Fixed conflicts again?