remove conflict ahead of merge