Cleaned up leftover merge tag