merge row-fluid changes