conflict resolved
latest code updated