Remove some merge artifacts