Remover leftover merge foo