Inplemented creation of a The factory and a simple unit test
conflict resolution