trying to fix merge conflicts and get it to work