take out leftover merge conflict