Refactor recipes and attributes
merge conflict resolution