Fixed merge conflicts
Merge pull request #19 from Chunhao137/artsafari

(feat) Fixed merge conflicts