Name changes and stuff
Conflict solving