minor change
remove conflicts