Small changes
Conflict solving