목록error: Your local changes to the following files would be overwritten by merge: (1)

I.K.Picture & IT Info.