some stuff
fix merge conflicts