actually fix merge conflict