try fix bug merge