conflict resolved
img