update to fix merge conflict