minor mod
merge conflict