update some stuff, fix conflicts