fixing bug because of failed merge