Shouldn't these conflict markers be removed?