Second attempt to fix merge conflicts