multiple update functions
merge conflict resolution