Bloody C9 didn't save my changes last time, nor show the conflict properly...fixed now.