Fixing leftover merge