Conflict markers == bad!