Vito Traino

For what it's worth, this happened again and clearing the index cache solved it again. I haven't been able to determine what might be causing it. 

Update: I found that the bug only applied to a single folder (I use one monolithic folder, so it didn't immediately occur to me to check others). I dug around and found the option in Preferences to...

Awesome, thanks again!

That makes sense! Thank you for the explanation, it will be nice to know how to avoid the merge conflict issue until/unless a new trigger is (potentially) added. 

Thanks for this fix!