Remove conflicted from retrieved_items regardless of condition
Remove conflicted from retrieved_items regardless of condition

standardfile/rails-engine,standardfile/rails-engine,standardfile/rails-engine