BUG: merge issue