Manually update conflict