Fix bug merge conflict