Fixed conflicts after merge