minor
merge conflict fix