fixed werid merge issue