Thanks! I think I fixed it all. If not, please let me know.

So how do I get rid of them? I assumed when I resolved conflicts that that type of thing would go away.