trying to solve suplicate conflict