working with objects
conflict resolved
my work