Fixed conflicts after mer