parsed art and artist json for art
fixed merge errors