added recipe
resolved conflicts