factory
merge conflito