Attempt to fix merge conflicts