fix conflicts after merge