text conflict
sovle it myself