You may want to conflict resolution