merging bug fix