fix merge for adding borders to fluid container