Ensure line bounding box is included when merging a remote change