i ch dev
i finish confilict