fix merge
clean up/ trying to fix bug