Yep, a conflict it is. If I were in your shoes I would do a backup of everything that you need and format. That, way, you can be sure everything is clean and the way it's supposed to be. Of course, it's up to you what you decide to do, you might very well be able to fix this without formatting...