Fix bug when Son merge 2 branch