completed the item loop
resolved conflicts