hopefully not messing up :poop:
fix merge
added and reconfigured