Add specs and refactoring
Conflict solve