Trying to fix merge conflicts