error: Pulling is not possible because you have unmerged files.hint: Fix them up in the work tree, and then use 'git add/rm <file>'hint: as appropriate to mark resolution and make a commit.fatal: Exiting because of an unresolved conflict.무슨 문제일까요?

   5063a14..041e3a0  main       -> origin/mainerror: Your local changes to the following files would be overwritten by merge:layouts/el_imin/layout.htmlmodules/board/skins/eb_imin/view.htmlPlease commit your changes or stash them before you merge.AbortingUpdating 506 더보기