fixing the found duplicate and different resources flow