Nicer conflict markers