changes
slight problem still
next one
basically works now
conflict resolved