Fix bug merge