fixing leftover merge errors.