some reseting from merge conflicts i did not fix correctly