Variable rename
Conflict solving 2