update support
resolve a conflict