fix ommited merge conflict