took out leftover merge conf line