fixed bug : merge error