fix bug merge