stuff
fix merge conf