update card
resolve conflict