resolved text conflict