merge conflicting on stripping spaces