Took out leftover conflict code