this thing sucks at recognizing unresolved conflicts