some stuff
conflicts fixed