leftover merge goofs