add yogurt lose the merge problems