starting over
conflict resolved
some small changes