Conflicted file got pushed to master, unnoticed!

I'm not sure how, but after making some changes to our project last night I pulled in a couple of updates from other team members through Unity Collaborate, and then pushed my changes.

At no point was I notified that there was a conflict with one of our main scene files. However, today the scene file is totally broken in the master with conflict markers in it, and blocking others from working.

The only thing I can think of is that there was a conflict with another file (texturepacker's settings file which constantly likes to switch line-endings depending on whether the project member is on mac or windows). I kept remote changes as I'm a minority in our team using Mac OS.

So maybe because there was a conflict with another file, Unity Collaborate didn't notice the conflict in our scene file? I'm not sure how to repro this sorry. Happy to take suggestions.