Fix some stuff
Fix conflicts