trying to work
fix merge