add show action
update recipes list
add recipe show page
fix merge conflict