Fix bug merge.