Merge in nginix/tabix server