add/update a new recipe
fix a merge conflict