cleared conflict markers