conflict resolved
second resolution