let bar = 'x';

let myObj = {
    foo: 1,
<<<<<<< LEFT
    bar
||||||| BASE
=======
    bar: 'bar'
>>>>>>> RIGHT
};