bug fix bad merge