bug fix: merge problem