put conflict resolution