Merging in Border Color/Width changes