fix code conflicts after merge with master branch