Merging conflict with Unity library script assemblies

Hi, I'm using mercurial/kiln for version control and I accidentally recently just pushed up all my unity files to a repository.

However, now I get these merge conflicts listed below:

 % hg --repository C:\kiln\development merge --verbose --tool=internal:fail 4590
 ~/Assembly-CSharp-Editor.pidb: untracked file differs
 ~/Assembly-UnityScript-Editor.pidb: untracked file differs
 ~/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll: untracked file differs
 ~/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb: untracked file differs
 ~/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll: untracked file differs
 ~/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb: untracked file differs
 ~/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll: untracked file differs
 ~/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb: untracked file differs
 abort: untracked files in working directory differ from files in requested revision

It says "All conflicting files will be marked unresolved." and that I can't proceed to merge with the other branches.

How do I fix this problem. I was wondering if it would be alright if I just delete the above files from my repository and then just pull from the main repository. However, I'm worried that it would accept my game in any way.

What should I do?