bug merge