resolve git conflicts w/ product entity
update repository pattern