style
merge conflict resolution