Conflict resolution commit 2