small changes
merge conflict averted